Patchwork [5,of,5,main-line-of-work,(12,more,to,go)] transaction: drop special handling for phases and bookmarks generation

login
register
mail settings
Submitter Pierre-Yves David
Date Nov. 14, 2014, 6:58 p.m.
Message ID <755cc58a66ec4ef0b21d.1415991505@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/6737/
State Accepted
Commit fc73293f6060eeb3470733da2f45dc19e0e83efc
Headers show

Comments

Pierre-Yves David - Nov. 14, 2014, 6:58 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1415803668 0
#      Wed Nov 12 14:47:48 2014 +0000
# Node ID 755cc58a66ec4ef0b21d899c10c7a127780dc8b8
# Parent  9a474e2e2129056029cf196c1935769344fce855
transaction: drop special handling for phases and bookmarks generation

We are still doing double backup, but this now that we have proper location
handling this is less an issue. Dropping this simplifies the code before we add
some pending related logic.

This also ensure we actually test the new 'location' mechanism.
Matt Mackall - Nov. 17, 2014, 7:55 p.m.
On Fri, 2014-11-14 at 18:58 +0000, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1415803668 0
> #      Wed Nov 12 14:47:48 2014 +0000
> # Node ID 755cc58a66ec4ef0b21d899c10c7a127780dc8b8
> # Parent  9a474e2e2129056029cf196c1935769344fce855
> transaction: drop special handling for phases and bookmarks generation
> 
> We are still doing double backup, but this now that we have proper location
> handling this is less an issue. Dropping this simplifies the code before we add
> some pending related logic.

These are queued for default, thanks.

Patch

diff --git a/mercurial/transaction.py b/mercurial/transaction.py
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -268,15 +268,11 @@  class transaction(object):
             order, filenames, genfunc, location = entry
             vfs = self._vfsmap[location]
             files = []
             try:
                 for name in filenames:
-                    # Some files are already backed up when creating the
-                    # localrepo. Until this is properly fixed we disable the
-                    # backup for them.
-                    if name not in ('phaseroots', 'bookmarks'):
-                        self.addbackup(name, location=location)
+                    self.addbackup(name, location=location)
                     files.append(vfs(name, 'w', atomictemp=True))
                 genfunc(*files)
             finally:
                 for f in files:
                     f.close()