largefiles: use clearer debug messages in actions
In overridecalculateupdates(), 'g' (get) actions may be converted into
other actions. In most of these cases, it does not make sense to keep
the action's message. For example, 'remote created' does not make
sense for an 'r' (remove) action.
--- a/hgext/largefiles/overrides.py Fri Nov 21 11:44:57 2014 -0800
+++ b/hgext/largefiles/overrides.py Fri Nov 21 13:02:45 2014 -0800
@@ -449,10 +449,10 @@
# else, prompt
repo.ui.promptchoice(usermsg, 0) == 0
): # pick remote largefile
- actions['r'].append((lfile, None, msg))
+ actions['r'].append((lfile, None, 'replaced by standin'))
newglist.append((standin, (p2.flags(standin),), msg))
else: # keep local normal file
- actions['r'].append((standin, None, msg))
+ actions['r'].append((standin, None, 'replaced by non-standin'))
elif lfutil.standin(f) in p1 and lfutil.standin(f) not in removes:
# Case 2: largefile in the working copy, normal file in
# the second parent
@@ -472,16 +472,16 @@
): # keep local largefile
if branchmerge:
# largefile can be restored from standin safely
- actions['r'].append((lfile, None, msg))
+ actions['r'].append((lfile, None, 'replaced by standin'))
else:
# "lfile" should be marked as "removed" without
# removal of itself
- lfmr.append((lfile, None, msg))
+ lfmr.append((lfile, None, 'forget non-standin largefile'))
# linear-merge should treat this largefile as 're-added'
- actions['a'].append((standin, None, msg))
+ actions['a'].append((standin, None, 'keep standin'))
else: # pick remote normal file
- actions['r'].append((standin, None, msg))
+ actions['r'].append((standin, None, 'replaced by non-standin'))
newglist.append((lfile, (p2.flags(lfile),), msg))
else:
newglist.append(action)