This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7667

status: extract active-merge state for reuse
ClosedPublic

Authored by rdamazio on Dec 14 2019, 12:49 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4ca89cc20d02: status: extract active-merge state for reuse

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

rdamazio created this revision.Dec 14 2019, 12:49 AM
rdamazio updated this revision to Diff 18845.Dec 18 2019, 12:17 AM
pulkit added a subscriber: pulkit.Dec 18 2019, 2:18 AM

This PR is doing more than one thing. I can see following independent things:

  • rename of inmergestate to activemerge
  • introduction of _formattedpaths which is used in next patch and not related to this one
  • what the commit message says

Can we split them up?

rdamazio retitled this revision from status: make morestatus call out unresolved conflicts after update to status: extract active-merge state for reuse.Dec 19 2019, 2:47 AM
rdamazio added a child revision: D7704: status: make morestatus call out unresolved conflicts after update.
rdamazio updated this revision to Diff 18875.
rdamazio added a comment.Dec 19 2019, 2:47 AM

Can we split them up?

Done. Kept this review as the first of the chain.

pulkit accepted this revision.Dec 19 2019, 6:00 AM
This revision is now accepted and ready to land.Dec 19 2019, 6:00 AM
pulkit added a comment.Dec 19 2019, 12:52 PM

Amended the following in flight to make black happy:

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -879,11 +879,8 @@ def readmorestatus(repo):
     if activemerge:
         unresolved = sorted(mergestate.unresolved())
     return morestatus(
-        repo.root,
-        unfinishedop,
-        unfinishedmsg,
-        activemerge,
-        unresolved)
+        repo.root, unfinishedop, unfinishedmsg, activemerge, unresolved
+    )
 
 
 def findpossible(cmd, table, strict=False):
rdamazio added a commit: rHG4ca89cc20d02: status: extract active-merge state for reuse.Dec 19 2019, 12:54 PM
Closed by commit rHG4ca89cc20d02: status: extract active-merge state for reuse (authored by rdamazio). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (51 lines)
Mtests/test-update-branches.t (28 lines)

Diff 18845

mercurial/cmdutil.py

return b'\n'.join(commentedlines) + b'\n' return b'\n'.join(commentedlines) + b'\n'
@attr.s(frozen=True) @attr.s(frozen=True)
class morestatus(object): class morestatus(object):
reporoot = attr.ib() reporoot = attr.ib()
unfinishedop = attr.ib() unfinishedop = attr.ib()
unfinishedmsg = attr.ib() unfinishedmsg = attr.ib()
inmergestate = attr.ib() activemerge = attr.ib()
unresolvedpaths = attr.ib() unresolvedpaths = attr.ib()
_formattedpaths = attr.ib(init=False, default=set())
_label = b'status.morestatus' _label = b'status.morestatus'
def formatfile(self, path, fm): def formatfile(self, path, fm):
if self.inmergestate and path in self.unresolvedpaths: self._formattedpaths.add(path)
if self.activemerge and path in self.unresolvedpaths:
fm.data(unresolved=True) fm.data(unresolved=True)
def formatfooter(self, fm): def formatfooter(self, fm):
if self.unfinishedop or self.unfinishedmsg:
fm.startitem() fm.startitem()
fm.data( fm.data(itemtype=b'morestatus')
itemtype=b'morestatus',
unfinished=self.unfinishedop,
unfinishedmsg=self.unfinishedmsg,
)
if self.unfinishedop:
fm.data(unfinished=self.unfinishedop)
statemsg = ( statemsg = (
_(b'The repository is in an unfinished *%s* state.') _(b'The repository is in an unfinished *%s* state.')
% self.unfinishedop % self.unfinishedop
) )
fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label)
if self.unfinishedmsg:
fm.data(unfinishedmsg=self.unfinishedmsg)
self._formatconflicts(fm) self._formatconflicts(fm)
if self.unfinishedmsg: if self.unfinishedmsg:
fm.plain( fm.plain(
b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label
) )
def _formatconflicts(self, fm): def _formatconflicts(self, fm):
if not self.inmergestate: if not self.activemerge:
return return
if self.unresolvedpaths: if self.unresolvedpaths:
mergeliststr = b'\n'.join( mergeliststr = b'\n'.join(
[ [
b' %s' b' %s'
% util.pathto(self.reporoot, encoding.getcwd(), path) % util.pathto(self.reporoot, encoding.getcwd(), path)
for path in self.unresolvedpaths for path in self.unresolvedpaths
msg = _(b'No unresolved merge conflicts.') msg = _(b'No unresolved merge conflicts.')
fm.plain(b'%s\n' % _commentlines(msg), label=self._label) fm.plain(b'%s\n' % _commentlines(msg), label=self._label)
def readmorestatus(repo): def readmorestatus(repo):
"""Returns a morestatus object if the repo has unfinished state.""" """Returns a morestatus object if the repo has unfinished state."""
statetuple = statemod.getrepostate(repo) statetuple = statemod.getrepostate(repo)
if not statetuple: mergestate = mergemod.mergestate.read(repo)
activemerge = mergestate.active()
if not statetuple and not activemerge:
return None return None
unfinishedop = unfinishedmsg = unresolved = None
if statetuple:
unfinishedop, unfinishedmsg = statetuple unfinishedop, unfinishedmsg = statetuple
mergestate = mergemod.mergestate.read(repo) if activemerge:
unresolved = None
if mergestate.active():
unresolved = sorted(mergestate.unresolved()) unresolved = sorted(mergestate.unresolved())
return morestatus( return morestatus(
repo.root, repo.root,
unfinishedop, unfinishedop,
unfinishedmsg, unfinishedmsg,
unresolved is not None, activemerge,
unresolved, unresolved)
)
def findpossible(cmd, table, strict=False): def findpossible(cmd, table, strict=False):
""" """
Return cmd -> (aliases, command table entry) Return cmd -> (aliases, command table entry)
for each matching command. for each matching command.
Return debug commands (or their aliases) only if no normal command matches. Return debug commands (or their aliases) only if no normal command matches.
""" """

tests/test-update-branches.t

merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ hg st $ hg st
M a M a
? a.orig ? a.orig
# Unresolved merge conflicts:
#
# a
#
# To mark files as resolved: hg resolve --mark FILE
$ cat a $ cat a
<<<<<<< working copy: 6efa171f091b - test: 3 <<<<<<< working copy: 6efa171f091b - test: 3
three three
dirty dirty
||||||| base ||||||| base
three three
======= =======
four four
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ rm a.orig $ rm a.orig
$ hg status $ hg status
M a M a
# Unresolved merge conflicts:
#
# a
#
# To mark files as resolved: hg resolve --mark FILE
$ hg resolve -l $ hg resolve -l
U a U a
Change/delete conflict is not allowed Change/delete conflict is not allowed
$ hg up -qC 3 $ hg up -qC 3
$ hg rm foo $ hg rm foo
$ hg up -q 4 $ hg up -q 4
Test that statuses are reported properly before and after merge resolution. Test that statuses are reported properly before and after merge resolution.
$ rm a.orig $ rm a.orig
$ hg resolve -l $ hg resolve -l
U a U a
$ hg status $ hg status
M a M a
M foo M foo
# Unresolved merge conflicts:
#
# a
#
# To mark files as resolved: hg resolve --mark FILE
$ hg revert -r . a $ hg revert -r . a
$ rm a.orig $ rm a.orig
$ hg resolve -l $ hg resolve -l
U a U a
$ hg status $ hg status
M foo M foo
# Unresolved merge conflicts:
#
# a
#
# To mark files as resolved: hg resolve --mark FILE
$ hg status -Tjson $ hg status -Tjson
[ [
{ {
"itemtype": "file", "itemtype": "file",
"path": "foo", "path": "foo",
"status": "M" "status": "M"
} }
] ]
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
$ hg resolve -l $ hg resolve -l
R a R a
$ hg status $ hg status
M foo M foo
# No unresolved merge conflicts.
$ hg status -Tjson $ hg status -Tjson
[ [
{ {
"itemtype": "file", "itemtype": "file",
"path": "foo", "path": "foo",
"status": "M" "status": "M"
} }
] ]
Test that 4 is detected as the no-argument destination from 3 and also moves Test that 4 is detected as the no-argument destination from 3 and also moves
the bookmark with it the bookmark with it
$ hg up --quiet 0 # we should be able to update to 3 directly $ hg up --quiet 0 # we should be able to update to 3 directly
$ hg status
M foo
$ hg up --quiet --hidden 3 # but not implemented yet. $ hg up --quiet --hidden 3 # but not implemented yet.
updated to hidden changeset 6efa171f091b updated to hidden changeset 6efa171f091b
(hidden revision '6efa171f091b' was rewritten as: d047485b3896) (hidden revision '6efa171f091b' was rewritten as: d047485b3896)
$ hg book -f bm $ hg book -f bm
$ hg up $ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating bookmark bm updating bookmark bm
$ hg book $ hg book