Patchwork [2,of,4] largefiles: don't try to explain rename history before prompt for conflicts

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 12, 2014, 10:54 p.m.
Message ID <b9f519eaee350620586f.1389567291@localhost.localdomain>
Download mbox | patch
Permalink /patch/3317/
State Accepted
Commit 675f578856dd14383c7185f1c326c7e52f69cf5b
Headers show

Comments

Mads Kiilerich - Jan. 12, 2014, 10:54 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1384634789 18000
#      Sat Nov 16 15:46:29 2013 -0500
# Node ID b9f519eaee350620586fd098f6379a307e333834
# Parent  aa65fa6beb615f0157e3dc9e7155dc586a34a8cb
largefiles: don't try to explain rename history before prompt for conflicts

Before it tried to explain the exact situation when merging moved largefiles.
That do not happen for normal merges and is not more relevant for largefiles
than for normal files. It is unneeded complexity - remove it.

Patch

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -426,15 +426,6 @@  def overridefilemerge(origfn, repo, myno
         if not fcother.cmp(fcdest): # files identical?
             return None
 
-        if orig != fcother.path():
-            repo.ui.status(_('merging %s and %s to %s\n')
-                           % (lfutil.splitstandin(orig),
-                              lfutil.splitstandin(fcother.path()),
-                              lfutil.splitstandin(fcdest.path())))
-        else:
-            repo.ui.status(_('merging %s\n')
-                           % lfutil.splitstandin(fcdest.path()))
-
         if repo.ui.promptchoice(_('largefile %s has a merge conflict\n'
                                   'keep (l)ocal or take (o)ther?'
                                   '$$ &Local $$ &Other') %
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -1374,7 +1374,6 @@  correctly.
   (run 'hg heads' to see heads, 'hg merge' to merge)
   2 largefiles cached
   $ hg merge
-  merging sub/large4
   largefile sub/large4 has a merge conflict
   keep (l)ocal or take (o)ther? l
   3 files updated, 1 files merged, 0 files removed, 0 files unresolved