| Wed, 30 Nov 2011 17:15:39 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 29 Nov 2011 19:51:35 +0100 |
Benoit Allard |
diff: '\ No newline at end of file' is also not part of the header
stable
|
file |
diff |
annotate
|
| Fri, 18 Nov 2011 12:04:31 +0100 |
Patrick Mezard |
annotate: support diff whitespace filtering flags (issue3030)
|
file |
diff |
annotate
|
| Mon, 14 Nov 2011 18:16:01 +0100 |
Patrick Mezard |
patch: simplify hunk extents parsing
|
file |
diff |
annotate
|
| Wed, 09 Nov 2011 16:55:59 -0800 |
Nicolas Venegas |
mdiff/patch: fix bad hunk handling for unified diffs with zero context
stable
|
file |
diff |
annotate
|
| Mon, 24 Oct 2011 13:41:19 +0200 |
Patrick Mezard |
diffstat: be more picky when marking file as 'binary' (issue2816)
stable
|
file |
diff |
annotate
|
| Wed, 05 Oct 2011 09:20:38 +0300 |
Kirill Elagin |
diff: enhance highlighting with color (issue3034)
|
file |
diff |
annotate
|
| Tue, 27 Sep 2011 18:50:18 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 27 Sep 2011 18:41:09 -0500 |
Steffen Daode Nurpmeso |
patch: correctly handle non-tabular Subject: line
stable
|
file |
diff |
annotate
|
| Mon, 12 Sep 2011 23:02:45 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sun, 11 Sep 2011 18:49:41 +0200 |
Dan Villiom Podlaski Christiansen |
patch: handle 'gitpatches' being empty, but not none
stable
|
file |
diff |
annotate
|
| Mon, 25 Jul 2011 16:02:27 -0500 |
Augie Fackler |
patch: use safehasattr instead of hasattr
|
file |
diff |
annotate
|
| Mon, 04 Jul 2011 19:53:39 -0300 |
Wagner Bruna |
patch: fix parsing patch files containing CRs not followed by LFs
stable
|
file |
diff |
annotate
|
| Wed, 29 Jun 2011 15:00:00 +0200 |
Thomas Arendsen Hein |
classes: fix class style problems found by b071cd58af50
stable
|
file |
diff |
annotate
|
| Mon, 20 Jun 2011 09:30:03 +0200 |
Peter Arrenbrecht |
patch: fix typo in variable name
stable
|
file |
diff |
annotate
|
| Fri, 17 Jun 2011 20:33:02 +0200 |
Patrick Mezard |
patch: make filestore store data in memory and fallback to fs
|
file |
diff |
annotate
|
| Tue, 14 Jun 2011 23:26:35 +0200 |
Patrick Mezard |
import: add --bypass option
|
file |
diff |
annotate
|
| Tue, 14 Jun 2011 23:24:34 +0200 |
Patrick Mezard |
patch: extend filtestore to store an optional copy source
|
file |
diff |
annotate
|
| Sat, 11 Jun 2011 14:17:25 +0200 |
Patrick Mezard |
patch: generalize the use of patchmeta in applydiff()
|
file |
diff |
annotate
|
| Sat, 11 Jun 2011 14:14:13 +0200 |
Patrick Mezard |
patch: stop updating changed files set in applydiff()
|
file |
diff |
annotate
|
| Sat, 11 Jun 2011 14:14:11 +0200 |
Patrick Mezard |
patch: turn patch() touched files dict into a set
|
file |
diff |
annotate
|
| Sun, 05 Jun 2011 22:26:01 +0200 |
Patrick Mezard |
patch: dot not ignore hunk of files marked as 'deleted'
|
file |
diff |
annotate
|
| Sun, 05 Jun 2011 22:24:19 +0200 |
Patrick Mezard |
patch: fix patchmeta/hunk synchronization in iterhunks()
|
file |
diff |
annotate
|
| Sun, 05 Jun 2011 22:24:11 +0200 |
Patrick Mezard |
patch: remove unnecessary exists() call in selectfile()
|
file |
diff |
annotate
|
| Sun, 05 Jun 2011 13:27:06 +0200 |
Patrick Mezard |
patch: remove redundant islink() call
|
file |
diff |
annotate
|
| Wed, 01 Jun 2011 12:38:46 +0200 |
Martin Geisler |
check-code: flag 0/1 used as constant Boolean expression
|
file |
diff |
annotate
|
| Fri, 27 May 2011 21:50:11 +0200 |
Patrick Mezard |
patch: do not patch unknown files (issue752)
|
file |
diff |
annotate
|
| Fri, 27 May 2011 21:50:10 +0200 |
Patrick Mezard |
patch: use temporary files to handle intermediate copies
|
file |
diff |
annotate
|
| Fri, 27 May 2011 21:50:09 +0200 |
Patrick Mezard |
patch: refactor file creation/removal detection
|
file |
diff |
annotate
|
| Thu, 26 May 2011 22:51:02 +0800 |
Steven Brown |
patch: restore the previous output of 'diff --stat'
|
file |
diff |
annotate
|
| Thu, 26 May 2011 17:15:35 -0500 |
Matt Mackall |
context: make forget work like commands.forget
|
file |
diff |
annotate
|
| Tue, 24 May 2011 14:21:04 +0200 |
Patrick Mezard |
patch: remove EOL support from linereader class
|
file |
diff |
annotate
|
| Sat, 21 May 2011 15:06:38 -0500 |
Matt Mackall |
patch: use diffstatsum in diffstat
|
file |
diff |
annotate
|
| Sat, 21 May 2011 15:06:36 -0500 |
Matt Mackall |
patch: add diffstatsum helper
|
file |
diff |
annotate
|
| Sat, 21 May 2011 15:01:28 -0500 |
Matt Mackall |
diffstatdata: no longer a generator
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:55:13 +0200 |
Patrick Mezard |
patch: fast-path git case in selectfile()
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:49:43 +0200 |
Patrick Mezard |
patch: unify backend file access interface
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:44:01 +0200 |
Patrick Mezard |
patch: merge backend setmode() into writelines()
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:44:01 +0200 |
Patrick Mezard |
patch: stop modifying gitpatch objects
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:44:01 +0200 |
Patrick Mezard |
patch: stop handling hunkless git blocks out of stream
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:44:01 +0200 |
Patrick Mezard |
patch: reindent code
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:44:01 +0200 |
Patrick Mezard |
patch: unify iterhunks() afile/bfile handling
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:44:01 +0200 |
Patrick Mezard |
patch: git metadata was ignored if strip > 1
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:44:01 +0200 |
Patrick Mezard |
patch: construct and parse binary hunks at the same time
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:44:01 +0200 |
Patrick Mezard |
patch: refactor iterhunks() regular and binary files emission
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:44:01 +0200 |
Patrick Mezard |
patch: remove patch.patch() cwd argument
|
file |
diff |
annotate
|
| Thu, 19 May 2011 22:44:01 +0200 |
Patrick Mezard |
patch: merge _updatedir() into externalpatch()
|
file |
diff |
annotate
|
| Wed, 18 May 2011 23:48:17 +0200 |
Patrick Mezard |
patch: add a workingbackend dirstate layer on top of fsbackend
|
file |
diff |
annotate
|
| Wed, 18 May 2011 23:48:13 +0200 |
Patrick Mezard |
patch: handle binary copies as regular ones
|
file |
diff |
annotate
|
| Wed, 18 May 2011 23:48:13 +0200 |
Patrick Mezard |
patch: remove files while patching, not in updatedir()
|
file |
diff |
annotate
|
| Wed, 18 May 2011 23:48:13 +0200 |
Patrick Mezard |
patch: set desired mode when patching, not in updatedir()
|
file |
diff |
annotate
|
| Wed, 18 May 2011 23:48:13 +0200 |
Patrick Mezard |
patch: stop changing current directory before patching
|
file |
diff |
annotate
|
| Wed, 18 May 2011 09:05:18 +0200 |
Sune Foldager |
patch: remove unused variable to make pyflakes test happy
|
file |
diff |
annotate
|
| Tue, 17 May 2011 23:46:38 +0200 |
Patrick Mezard |
patch: add lexists() to backends, use it in selectfile()
|
file |
diff |
annotate
|
| Tue, 17 May 2011 23:46:38 +0200 |
Patrick Mezard |
patch: move copyfile() into backends, abstract basedir
|
file |
diff |
annotate
|
| Tue, 17 May 2011 23:46:37 +0200 |
Patrick Mezard |
patch: merge makerejlines() into write_rej()
|
file |
diff |
annotate
|
| Tue, 17 May 2011 23:46:15 +0200 |
Patrick Mezard |
patch: extract fs access from patchfile into fsbackend
|
file |
diff |
annotate
|
| Tue, 17 May 2011 23:27:58 +0200 |
Patrick Mezard |
mq: fix qpush changes detection of renamed files
|
file |
diff |
annotate
|
| Fri, 13 May 2011 14:48:48 -0500 |
Matt Mackall |
scmutil: drop some aliases in cmdutil
|
file |
diff |
annotate
|
| Sun, 08 May 2011 17:48:31 +0200 |
Patrick Mezard |
patch: make patch()/internalpatch() always update the dirstate
|
file |
diff |
annotate
|
| Sun, 08 May 2011 17:48:30 +0200 |
Patrick Mezard |
patch: move updatedir() from cmdutil into patch
|
file |
diff |
annotate
|
| Fri, 06 May 2011 19:03:41 +0300 |
Idan Kamara |
patch: introduce changedfiles
|
file |
diff |
annotate
|
| Fri, 06 May 2011 18:45:12 +0300 |
Idan Kamara |
patch: remove unused ui arg to iterhunks
|
file |
diff |
annotate
|
| Fri, 06 May 2011 15:31:09 +0200 |
Adrian Buehlmann |
rename explain_exit to explainexit
|
file |
diff |
annotate
|
| Fri, 06 May 2011 15:19:48 +0200 |
Adrian Buehlmann |
rename util.parse_patch_output to parsepatchoutput
|
file |
diff |
annotate
|
| Fri, 06 May 2011 11:31:40 +0200 |
Martin Geisler |
patch: fix clash between local variable and exception instance
|
file |
diff |
annotate
|
| Fri, 06 May 2011 11:12:55 +0200 |
Martin Geisler |
patchfile: use real Booleans instead of 0/1
|
file |
diff |
annotate
|
| Tue, 26 Apr 2011 21:22:14 +0200 |
Patrick Mezard |
patch: remove redundant variable in iterhunks()
|
file |
diff |
annotate
|
| Wed, 20 Apr 2011 21:41:41 +0200 |
Adrian Buehlmann |
move canonpath from util to scmutil
|
file |
diff |
annotate
|
| Wed, 20 Apr 2011 19:54:57 +0200 |
Adrian Buehlmann |
move opener from util to scmutil
|
file |
diff |
annotate
|
| Mon, 04 Apr 2011 16:21:59 -0500 |
Matt Mackall |
misc: replace .parents()[0] with p1()
|
file |
diff |
annotate
|
| Thu, 24 Mar 2011 10:28:29 +0100 |
Patrick Mezard |
patch: deprecate ui.patch / external patcher feature
|
file |
diff |
annotate
|
| Sun, 20 Mar 2011 00:22:47 +0100 |
Patrick Mezard |
patch: move closefile() into patchfile.close()
|
file |
diff |
annotate
|
| Sun, 20 Mar 2011 00:09:44 +0100 |
Patrick Mezard |
patch: inline patchfile.hashlines()
|
file |
diff |
annotate
|
| Sun, 20 Mar 2011 00:08:44 +0100 |
Patrick Mezard |
patch: fix hunk newlines when parsing hunks, not in iterhunks()
|
file |
diff |
annotate
|
| Fri, 04 Feb 2011 16:32:14 -0300 |
Gastón Kleiman |
diffstat: fix parsing of filenames with spaces
|
file |
diff |
annotate
|
| Fri, 10 Dec 2010 15:14:05 +0100 |
Adrian Buehlmann |
opener: always reset flags on 'w'rite
|
file |
diff |
annotate
|
| Wed, 08 Dec 2010 13:12:12 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Fri, 03 Dec 2010 11:40:30 +0900 |
Patrick Mezard |
patch: write .rej files without rewriting EOLs
stable
|
file |
diff |
annotate
|
| Wed, 03 Nov 2010 21:11:07 +0100 |
Patrick Mezard |
patch: remove unused applydiff() sourcefile argument
|
file |
diff |
annotate
|
| Wed, 03 Nov 2010 21:11:05 +0100 |
Patrick Mezard |
patch: remove unused gitworkdone variable from iterhunks()
|
file |
diff |
annotate
|
| Sun, 24 Oct 2010 12:56:38 +0200 |
Patrick Mezard |
Test applying context diffs
stable
|
file |
diff |
annotate
|
| Thu, 14 Oct 2010 01:28:29 +0200 |
Mads Kiilerich |
import: only the first hg patch marker should be processed (issue2417)
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 15:13:08 -0500 |
Patrick Mezard |
patch: fails immediately upon malformed hunk
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 15:13:08 -0500 |
Patrick Mezard |
patch: always raise PatchError with a message, simplify handling
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 15:13:08 -0500 |
Patrick Mezard |
patch: simplify externalpatch() arguments
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 15:13:08 -0500 |
Patrick Mezard |
patch: remove internal patcher fallback and NoHunk error
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 15:13:08 -0500 |
Patrick Mezard |
patch: remove unused patchmeta.lineno
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 15:13:08 -0500 |
Patrick Mezard |
patch: remove unused flags from readgitpatch()
|
file |
diff |
annotate
|
| Fri, 08 Oct 2010 23:39:44 -0500 |
Mads Kiilerich |
import: don't strip '#' lines from patch descriptions (issue 2417)
|
file |
diff |
annotate
|
| Tue, 28 Sep 2010 01:11:24 +0200 |
Patrick Mezard |
Merge with stable
|
file |
diff |
annotate
|
| Tue, 28 Sep 2010 00:41:08 +0200 |
Patrick Mezard |
patch: test and document a bit binary to regular file upgrade
stable
|
file |
diff |
annotate
|
| Tue, 28 Sep 2010 00:41:07 +0200 |
Patrick Mezard |
patch: upgrade to git patch when removing binary file
stable
|
file |
diff |
annotate
|
| Mon, 27 Sep 2010 22:47:10 +0200 |
Patrick Mezard |
patch: fix rename text to binary file (issue2400)
stable
|
file |
diff |
annotate
|
| Mon, 20 Sep 2010 22:29:13 +0200 |
Patrick Mezard |
Merge with stable
|
file |
diff |
annotate
|
| Mon, 20 Sep 2010 21:46:56 +0200 |
Patrick Mezard |
Use lexists() instead of exists() where appropriate
stable
|
file |
diff |
annotate
|
| Mon, 20 Sep 2010 21:42:11 +0200 |
Patrick Mezard |
patch: do not overwrite broken untracked symlinks
stable
|
file |
diff |
annotate
|
| Mon, 20 Sep 2010 21:42:11 +0200 |
Patrick Mezard |
patch: fix target when patching broken symlinks (issue2368)
stable
|
file |
diff |
annotate
|
| Mon, 13 Sep 2010 13:08:09 +0200 |
Martin Geisler |
patch: break import cycle with cmdutil
|
file |
diff |
annotate
|
| Fri, 03 Sep 2010 12:58:51 +0200 |
Martin Geisler |
diff: recurse into subrepositories with --subrepos/-S flag
|
file |
diff |
annotate
|
| Thu, 02 Sep 2010 12:08:13 +0200 |
Martin Geisler |
clone, patch, convert: use hex(nullid) instead of '0'*40
|
file |
diff |
annotate
|
| Sun, 29 Aug 2010 22:55:37 +0200 |
Martin Geisler |
Merge with stable
|
file |
diff |
annotate
|
| Sun, 29 Aug 2010 22:37:58 +0200 |
Martin Geisler |
Lowercase error messages
stable
|
file |
diff |
annotate
|
| Wed, 25 Aug 2010 16:23:32 +0200 |
Martin Geisler |
util: remove lexists, Python 2.4 introduced os.path.lexists
|
file |
diff |
annotate
|
| Thu, 12 Aug 2010 17:58:03 +0200 |
Martin Geisler |
patch: fix typo in comment
|
file |
diff |
annotate
|
| Thu, 22 Jul 2010 14:30:27 +0900 |
Dan Drake |
patch: fix extract() docstring, it returns branch as well
stable
|
file |
diff |
annotate
|
| Sun, 18 Jul 2010 01:06:50 +0900 |
FUJIWARA Katsunori |
i18n: use encoding.colwidth() for correct column width
stable
|
file |
diff |
annotate
|
| Thu, 17 Jun 2010 15:51:27 +0200 |
Dirkjan Ochtman |
patch: inline small, single-use 'write' function
|
file |
diff |
annotate
|
| Thu, 17 Jun 2010 15:50:35 +0200 |
Dirkjan Ochtman |
patch: inline small, single-use 'close' function
|
file |
diff |
annotate
|
| Mon, 07 Jun 2010 20:03:32 +0200 |
Dirkjan Ochtman |
move working dir/dirstate methods from localrepo to workingctx
|
file |
diff |
annotate
|
| Mon, 26 Apr 2010 13:21:03 +0200 |
Mads Kiilerich |
patch: strip paths in leaked git patchmeta objects
|
file |
diff |
annotate
|
| Mon, 26 Apr 2010 13:21:03 +0200 |
Mads Kiilerich |
patch: minor cleanup of _applydiff
|
file |
diff |
annotate
|
| Mon, 26 Apr 2010 13:21:02 +0200 |
Mads Kiilerich |
patch: git delete mode shouldn't be used at all
|
file |
diff |
annotate
|
| Mon, 26 Apr 2010 13:21:02 +0200 |
Mads Kiilerich |
patch: make "unable to strip away" message less confusing
|
file |
diff |
annotate
|
| Mon, 26 Apr 2010 13:21:02 +0200 |
Mads Kiilerich |
patch: descriptive patchmeta.__repr__ to help debugging
|
file |
diff |
annotate
|
| Sat, 17 Apr 2010 13:23:24 -0500 |
Augie Fackler |
patch: refactor applydiff to allow for mempatching
|
file |
diff |
annotate
|
| Sat, 17 Apr 2010 13:13:57 -0500 |
Augie Fackler |
patch: move mercurial-specific imports after stdlib imports
|
file |
diff |
annotate
|
| Wed, 14 Apr 2010 17:58:10 +0900 |
Nicolas Dumazet |
pylint, pyflakes: remove unused or duplicate imports
|
file |
diff |
annotate
|
| Sun, 11 Apr 2010 20:59:55 -0700 |
Brendan Cully |
Merge with stable
|
file |
diff |
annotate
|
| Fri, 09 Apr 2010 20:34:05 +0200 |
Peter Arrenbrecht |
patch: don't look for headers in diff lines
stable
|
file |
diff |
annotate
|