Mercurial > hg-stable

changeset 23528:5a6d85bae97f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: put same 'action' object back in 'newglist' The items we put in 'newglist' are always the same as what we found in actions['g'], so let's just put the same item into the list instead of creating a new one.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 09 Dec 2014 09:53:26 -0800
parents e61de5556b73
children 38e55e55ae4d
files hgext/largefiles/overrides.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Mon Dec 08 15:20:42 2014 -0800
+++ b/hgext/largefiles/overrides.py	Tue Dec 09 09:53:26 2014 -0800
@@ -443,7 +443,7 @@
                         '$$ &Largefile $$ &Normal file') % lfile
             if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile
                 actions['r'].append((lfile, None, 'replaced by standin'))
-                newglist.append((standin, (p2.flags(standin),), msg))
+                newglist.append(action)
             else: # keep local normal file
                 if branchmerge:
                     actions['k'].append((standin, None,
@@ -472,7 +472,7 @@
                     actions['a'].append((standin, None, 'keep standin'))
             else: # pick remote normal file
                 actions['r'].append((standin, None, 'replaced by non-standin'))
-                newglist.append((lfile, (p2.flags(lfile),), msg))
+                newglist.append(action)
         else:
             newglist.append(action)