Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

checking for lock field when parsing xml entries #693

Merged
merged 1 commit into from
Oct 28, 2019

Conversation

Sergi0
Copy link
Contributor

@Sergi0 Sergi0 commented Oct 24, 2019

Lock status was not properly recognized when 'lock' object was present in the status response from the server.

Doesn't implement #624, but helps with the locks issue mentioned there.

@codecov
Copy link

codecov bot commented Oct 24, 2019

Codecov Report

Merging #693 into master will increase coverage by 0.04%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #693      +/-   ##
==========================================
+ Coverage   56.38%   56.42%   +0.04%     
==========================================
  Files         117      117              
  Lines        4402     4402              
  Branches      649      649              
==========================================
+ Hits         2482     2484       +2     
  Misses       1685     1685              
+ Partials      235      233       -2
Impacted Files Coverage Δ
src/common/types.ts 100% <ø> (ø) ⬆️
src/statusParser.ts 73.68% <0%> (ø) ⬆️
src/repository.ts 61.22% <0%> (+0.43%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b67844d...2493ca0. Read the comment docs.

@JohnstonCode JohnstonCode requested review from edgardmessias and JohnstonCode and removed request for edgardmessias October 26, 2019 12:51
@JohnstonCode
Copy link
Owner

@Sergi0 is there ever a senario where the lock object is present and the wcLocked is not?

@Sergi0
Copy link
Contributor Author

Sergi0 commented Oct 28, 2019

@JohnstonCode
yeah, have no idea how this happens. here is the entry structure I have, after some data redaction.
it shows me 2500+ locked files in remote changes, so it's unbearable

<entry
   path="somefile.cpp">

   <wc-status
      item="normal"
      revision="700"
      props="normal">
      <commit
         revision="600">

         <author>dev</author>
         <date>2019</date>
      </commit>
   </wc-status>
   <repos-status
      item="none"
      props="none">

	   <lock>
		  <token>opaquelocktoken:</token>
		  <owner>sysadmin</owner>
		  <comment>my files</comment>
		  <created>2019</created>
	   </lock>
	</repos-status>
</entry>

Copy link
Owner

@JohnstonCode JohnstonCode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for that. LGTM!

@JohnstonCode JohnstonCode merged commit 5cb1413 into JohnstonCode:master Oct 28, 2019
JohnstonCode added a commit that referenced this pull request Oct 28, 2019
## [1.54.7](v1.54.6...v1.54.7) (2019-10-28)

### Bug Fixes

* checking for lock field when parsing xml entries ([#693](#693)) ([5cb1413](5cb1413))
@JohnstonCode
Copy link
Owner

🎉 This PR is included in version 1.54.7 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants