Patchwork [11,of,14] merge: remove old pre-audit code checking for absolute paths

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 13, 2013, 7:02 p.m.
Message ID <1f39ee198f6a290827b1.1358103766@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/586/
State Superseded
Commit 26627c30735a610f59979a36885b327b25d8dbff
Headers show

Comments

Mads Kiilerich - Jan. 13, 2013, 7:02 p.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1357785645 -3600
# Node ID 1f39ee198f6a290827b1dc4b5eb0ae39db752bcb
# Parent  583e0caedba3ec1fece6ec7afc0a2e44082d984e
merge: remove old pre-audit code checking for absolute paths

Audit will handle this in a more elegant way.

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -374,8 +374,6 @@  def applyupdates(repo, actions, wctx, mc
         f, m = a[:2]
         repo.ui.progress(_('updating'), i + 1, item=f, total=numupdates,
                          unit=_('files'))
-        if f and f[0] == "/":
-            continue
         if m == "r": # remove
             repo.ui.note(_("removing %s\n") % f)
             audit(f)
diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@@ -86,7 +86,7 @@  attack /tmp/test
   $ hg manifest -r4
   /tmp/test
   $ hg update -Cr4
-  abort: *: '$TESTTMP/target//tmp/test' (glob)
+  abort: path contains illegal component: /tmp/test
   [255]
 
   $ cd ..