# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1418147606 28800
# Node ID 5a6d85bae97fb6fe830c125fdde8068761ce3104
# Parent  e61de5556b73b927dde04c823f8ed9f25c743b78
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.

diff -r e61de5556b73 -r 5a6d85bae97f hgext/largefiles/overrides.py
--- 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)