Christian Ebert avatar Christian Ebert committed a0fb43d

All patches applied, remove.

Comments (0)

Files changed (5)

abort-merge.diff

-# HG changeset patch
-# User Christian Ebert <blacktrash@gmx.net>
-# Parent 261a07b3040722c06987d4bff64aa146aeb554e3
-Abort when trying to crecord a merge
-
-Analogous to feb2a58fc592 in main.
-
-diff --git a/crecord/__init__.py b/crecord/__init__.py
---- a/crecord/__init__.py
-+++ b/crecord/__init__.py
-@@ -24,7 +24,8 @@
-     You will be shown a list of patch hunks from which you can select
-     those you would like to apply to the commit.
- 
--    '''
-+    This command is not available when committing a merge.'''
-+
-     dorecord(ui, repo, commands.commit, *pats, **opts)
- 
- 
-diff --git a/crecord/crecord_core.py b/crecord/crecord_core.py
---- a/crecord/crecord_core.py
-+++ b/crecord/crecord_core.py
-@@ -36,6 +36,12 @@
-         In the end we'll record interesting changes, and everything else will be
-         left in place, so the user can continue his work.
-         """
-+
-+        merge = len(repo[None].parents()) > 1
-+        if merge:
-+            raise util.Abort(_('cannot partially commit a merge '
-+                               '(use hg commit instead)'))
-+
-         if match.files():
-             changes = None
-         else:

format-help.diff

-# HG changeset patch
-# Parent f41345700747bb4e44457a5c751400e38cedee0c
-# User Christian Ebert <blacktrash@gmx.net>
-Reformat help similar to main
-
-As opposed to recent Hg no ReStructuredText directives
-for backwards compatibility with 1.1.
-
-diff --git a/crecord/__init__.py b/crecord/__init__.py
---- a/crecord/__init__.py
-+++ b/crecord/__init__.py
-@@ -19,7 +19,7 @@
-     If a list of files is omitted, all changes reported by "hg status"
-     will be candidates for recording.
- 
--    See 'hg help dates' for a list of formats valid for -d/--date.
-+    See "hg help dates" for a list of formats valid for -d/--date.
- 
-     You will be shown a list of patch hunks from which you can select
-     those you would like to apply to the commit.
-@@ -32,8 +32,7 @@
- def qcrecord(ui, repo, patch, *pats, **opts):
-     '''interactively record a new patch
- 
--    see 'hg help qnew' & 'hg help record' for more information and usage
--    '''
-+    See "hg help qnew" & "hg help record" for more information and usage.'''
- 
-     try:
-         mq = extensions.find('mq')

no-debug-translate.diff

-# HG changeset patch
-# User Christian Ebert <blacktrash@gmx.net>
-# Parent b2fefb2225475b5926e01d5e205579a3a376210e
-Do not translate debug messages
-
-diff --git a/crecord/crecord_core.py b/crecord/crecord_core.py
---- a/crecord/crecord_core.py
-+++ b/crecord/crecord_core.py
-@@ -94,7 +94,7 @@
-                 fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
-                                                dir=backupdir)
-                 os.close(fd)
--                ui.debug(_('backup %r as %r\n') % (f, tmpname))
-+                ui.debug('backup %r as %r\n' % (f, tmpname))
-                 util.copyfile(repo.wjoin(f), tmpname)
-                 backups[f] = tmpname
- 
-@@ -120,7 +120,7 @@
-             # 3b. (apply)
-             if dopatch:
-                 try:
--                    ui.debug(_('applying patch\n'))
-+                    ui.debug('applying patch\n')
-                     ui.debug(fp.getvalue())
-                     patch.internalpatch(fp, ui, 1, repo.root)
-                 except patch.PatchError, err:
-@@ -148,7 +148,7 @@
-             # 5. finally restore backed-up files
-             try:
-                 for realname, tmpname in backups.iteritems():
--                    ui.debug(_('restoring %r to %r\n') % (tmpname, realname))
-+                    ui.debug('restoring %r to %r\n' % (tmpname, realname))
-                     util.copyfile(tmpname, repo.wjoin(realname))
-                     os.unlink(tmpname)
-                 os.rmdir(backupdir)
-typo.diff
-no-debug-translate.diff
-abort-merge.diff
-format-help.diff
 # Placed by Bitbucket

typo.diff

-# HG changeset patch
-# User Christian Ebert <blacktrash@gmx.net>
-# Parent 7ef671d7d75d96dd81380aa7edf51a38975dbf24
-Correct typos in docstring
-
-diff --git a/crecord/crecord_core.py b/crecord/crecord_core.py
---- a/crecord/crecord_core.py
-+++ b/crecord/crecord_core.py
-@@ -26,14 +26,14 @@
-     def recordfunc(ui, repo, message, match, opts):
-         """This is generic record driver.
- 
--        It's job is to interactively filter local changes, and accordingly
-+        Its job is to interactively filter local changes, and accordingly
-         prepare working dir into a state, where the job can be delegated to
-         non-interactive commit command such as 'commit' or 'qrefresh'.
- 
-         After the actual job is done by non-interactive command, working dir
-         state is restored to original.
- 
--        In the end we'll record intresting changes, and everything else will be
-+        In the end we'll record interesting changes, and everything else will be
-         left in place, so the user can continue his work.
-         """
-         if match.files():
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.