Fixed remaining underscore issues.

 
28
29
30
31
 
32
33
34
 
88
89
90
91
92
 
 
93
94
95
 
28
29
30
 
31
32
33
34
 
88
89
90
 
 
91
92
93
94
95
            @@ -28,7 +28,7 @@
         tobfile = True
         size = opts['size']
         if not size:
-            size = ui.config(bfutil.long_name, 'size', default=None)
+            size = ui.config(bfutil.longname, 'size', default=None)
             try:
                 size = int(size)
             except ValueError:
@@ -88,8 +88,8 @@
                                                     bfiles, normalfiles, matcher, size, bfiletohash)
             ui.progress(_('converting revisions'), None)
 
-            if os.path.exists(rdst.wjoin(bfutil.short_name)):
-                shutil.rmtree(rdst.wjoin(bfutil.short_name))
+            if os.path.exists(rdst.wjoin(bfutil.shortname)):
+                shutil.rmtree(rdst.wjoin(bfutil.shortname))
 
             for f in bfiletohash.keys():
                 if os.path.isfile(rdst.wjoin(f)):
 
618
619
620
621
 
622
623
624
 
1148
1149
1150
1151
 
1152
1153
1154
 
1232
1233
1234
1235
 
1236
1237
1238
 
618
619
620
 
621
622
623
624
 
1148
1149
1150
 
1151
1152
1153
1154
 
1232
1233
1234
 
1235
1236
1237
1238
            @@ -618,7 +618,7 @@
         # XXX handle removed differently
         if not opts['clean']:
             for bfile in unsure + modified + added:
-                bfutil.update_standin(repo, bfutil.standin(bfile))
+                bfutil.updatestandin(repo, bfutil.standin(bfile))
     finally:
         wlock.release()
     return orig(ui, repo, *pats, **opts)
@@ -1148,7 +1148,7 @@
     finally:
         wlock.release()
 
-def get_outgoing_bfiles(ui, repo, dest=None, **opts):
+def getoutgoingbfiles(ui, repo, dest=None, **opts):
     dest = ui.expandpath(dest or 'default-push', dest or 'default')
     dest, branches = hg.parseurl(dest, opts.get('branch'))
     revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
@@ -1232,7 +1232,7 @@
 
     # Manifests are only iterable so turn them into sets then union
     for file in manifesttip.union(manifestworking):
-        if file.startswith(bfutil.short_name):
+        if file.startswith(bfutil.shortname):
             raise util.Abort(_('addremove cannot be run on a repo with bfiles'))
 
     return orig(ui, repo, *pats, **opts)
 
400
401
402
403
 
404
405
406
 
400
401
402
 
403
404
405
406
            @@ -400,7 +400,7 @@
     if os.name == 'posix':
         # Yuck: on Unix, go through open(2) to ensure that the caller's mode is
         # filtered by umask() in the kernel, where it's supposed to be done.
-        wfile = os.fdopen(os.open(filename, os.O_WRONLY|os.O_CREAT, get_mode(executable)), 'wb')
+        wfile = os.fdopen(os.open(filename, os.O_WRONLY|os.O_CREAT, getmode(executable)), 'wb')
     else:
         # But on Windows, use open() directly, since passing mode='wb' to os.fdopen()
         # does not work.  (Python bug?)
 
11
12
13
14
 
15
16
17
 
11
12
13
 
14
15
16
17
            @@ -11,7 +11,7 @@
        Since the cache is updated elsewhere, we can just read from it here as if it were the store.'''
 
     def __init__(self, ui, repo, url):
-        url = os.path.join(url, '.hg', bfutil.long_name)
+        url = os.path.join(url, '.hg', bfutil.longname)
         super(localstore, self).__init__(ui, repo, util.expandpath(url))
 
     def put(self, source, filename, hash):