[PATCH 3 of 3 V1] shelve: refactor directory name into constant

Oleg Afanasyev olegaf at fb.com
Thu Apr 7 21:08:22 EDT 2016


# HG changeset patch
# User Oleg Afanasyev <olegaf at fb.com>
# Date 1459888093 25200
#      Tue Apr 05 13:28:13 2016 -0700
# Node ID 6fc94bf7cc60bada8327676ec14ec08087042cc6
# Parent  ab3afe021b6c10820ab8fb28cb04767f17b203fc
shelve: refactor directory name into constant

Shelve directory name extracted into constant to avoid typos/duplication.

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -60,6 +60,7 @@
 testedwith = 'internal'
 
 backupdir = 'shelve-backup'
+shelvedir = 'shelved'
 
 class shelvedfile(object):
     """Helper for the file storing a single shelve
@@ -69,7 +70,7 @@
     def __init__(self, repo, name, filetype=None):
         self.repo = repo
         self.name = name
-        self.vfs = scmutil.vfs(repo.sharedvfs().join('shelved'))
+        self.vfs = scmutil.vfs(repo.sharedvfs().join(shelvedir))
         self.backupvfs = scmutil.vfs(repo.join(backupdir))
         self.ui = self.repo.ui
         if filetype:
@@ -408,7 +409,7 @@
     """subcommand that deletes all shelves"""
 
     with repo.wlock():
-        for (name, _type) in repo.sharedvfs().readdir('shelved'):
+        for (name, _type) in repo.sharedvfs().readdir(shelvedir):
             suffix = name.rsplit('.', 1)[-1]
             if suffix in ('hg', 'patch'):
                 shelvedfile(repo, name).movetobackup()
@@ -432,7 +433,7 @@
 def listshelves(repo):
     """return all shelves in repo as list of (time, filename)"""
     try:
-        names = repo.sharedvfs().readdir('shelved')
+        names = repo.sharedvfs().readdir(shelvedir)
     except OSError as err:
         if err.errno != errno.ENOENT:
             raise


More information about the Mercurial-devel mailing list