Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
logcmdutil: also check for copies in null revision and working copy
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 18 Jun 2019 23:19:24 -0700
changeset 42502 c929f612afac
parent 42501 75334e5b519e
child 42503 88ba0ff94605
logcmdutil: also check for copies in null revision and working copy It's safe (and fast) to look for copies in the null revision, and it's incorrect not to look for them in the working copy, so let's look in both places. Differential Revision: https://phab.mercurial-scm.org/D6544
mercurial/logcmdutil.py file | annotate | diff | comparison | revisions
tests/test-status.t file | annotate | diff | comparison | revisions 
--- a/mercurial/logcmdutil.py	Tue Jun 18 23:23:30 2019 -0700
+++ b/mercurial/logcmdutil.py	Tue Jun 18 23:19:24 2019 -0700
@@ -891,7 +891,7 @@
     for rev, type, ctx, parents in dag:
         char = formatnode(repo, ctx)
         copies = None
-        if getrenamed and ctx.rev():
+        if getrenamed:
             copies = []
             for fn in ctx.files():
                 rename = getrenamed(fn, ctx.rev())
@@ -919,7 +919,7 @@
     for rev in revs:
         ctx = repo[rev]
         copies = None
-        if getrenamed is not None and rev:
+        if getrenamed is not None:
             copies = []
             for fn in ctx.files():
                 rename = getrenamed(fn, rev)
--- a/tests/test-status.t	Tue Jun 18 23:23:30 2019 -0700
+++ b/tests/test-status.t	Tue Jun 18 23:19:24 2019 -0700
@@ -630,7 +630,6 @@
     b
   R b
   
-BROKEN: as above, 'a' should be marked a copy
   $ hg log -GTstatus -r 'wdir()' -C
   o  changeset:   2147483647:ffffffffffff
   |  parent:      0:8c55c58b4c0e
@@ -638,6 +637,7 @@
      date:        * (glob)
      files:
      M a
+       b
      R b
Mercurial