Mercurial > hg

log mercurial/patch.py @ 8025:1280934dd2dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Sat, 04 Apr 2009 19:43:00 +0200 Dirkjan Ochtman merge with crew-stable
Tue, 24 Mar 2009 23:28:55 +0000 Vsevolod Solovyov Fix issue1495, corner case of adding empty files via patching
Mon, 23 Mar 2009 13:12:07 +0100 Peter Arrenbrecht cleanup: drop unused imports
Fri, 20 Mar 2009 14:38:50 -0500 Matt Mackall diffstat: use width 80 by default and avoid division by zero
Mon, 16 Feb 2009 17:37:23 -0600 Matt Mackall patch: teach selectfile about symlinks (issue1438)
Thu, 12 Feb 2009 12:35:48 +0100 Dirkjan Ochtman patch: no need to instantiate a match catch-all in diff()
Sat, 07 Feb 2009 23:29:12 +0100 Dirkjan Ochtman merge with mpm
Wed, 04 Feb 2009 20:53:38 +0100 Martin Geisler patch: turned strings with backslashes into raw strings
Sun, 25 Jan 2009 21:20:13 +0100 Mads Kiilerich Make util.find_exe alway returns existing file, fixing issue1459
Mon, 19 Jan 2009 12:59:56 +0100 Dirkjan Ochtman kill some trailing whitespace
Tue, 13 Jan 2009 20:28:06 +0200 Patrick Mezard diffstat: don't fail on merges
Fri, 09 Jan 2009 01:36:35 +0100 Benoit Boissinot patch: export shouldn't close files received as a parameter
Sat, 03 Jan 2009 21:24:31 +0100 Dirkjan Ochtman merge with crew-stable
Fri, 02 Jan 2009 22:53:33 +0100 Martin Geisler use repo.wjoin(f) instead of os.path.join(repo.root, f)
Sat, 03 Jan 2009 20:33:37 +0100 Dirkjan Ochtman patch: kill some trailing whitespace
Thu, 25 Dec 2008 10:48:24 +0200 Alexander Solovyov python implementation of diffstat
Sun, 14 Dec 2008 23:05:18 -0800 Brendan Cully Merge with crew-stable
Fri, 05 Dec 2008 14:51:50 +0100 Bartosz SKOWRON patch: simplify linereader
Sun, 14 Dec 2008 23:04:29 -0800 Brendan Cully patch: handle git patches that remove symlinks (issue1438)
Thu, 11 Dec 2008 22:59:35 +0100 Patrick Mezard patch: catch only IOError from makedirs()
Tue, 09 Dec 2008 14:27:47 +0100 Stefan Rusek When applying a git diff, ensure that the target dir exists for new files
Sat, 22 Nov 2008 00:21:57 -0800 Brendan Cully import: add similarity option (issue295)
Wed, 19 Nov 2008 13:27:57 +0100 Patrick Mezard patch: isolate patchfile filesystem calls into methods
Wed, 19 Nov 2008 13:27:57 +0100 Patrick Mezard patch: pass an opener to patchfile
Wed, 19 Nov 2008 13:27:57 +0100 Patrick Mezard patch: remove useless unlink() call
Thu, 06 Nov 2008 11:17:38 +0100 Ronny Pfannschmidt export: fixed silent output file overwriting
Mon, 03 Nov 2008 16:48:23 +0100 Dirkjan Ochtman patch: turn patch.diff() into a generator
Mon, 27 Oct 2008 22:57:55 +0100 Patrick Mezard patch: rewrite diffstat with util.filter()
Sun, 26 Oct 2008 17:26:28 +0100 Patrick Mezard patch: fix patched files records in externalpatcher()
Fri, 24 Oct 2008 20:46:56 +0200 Bartosz SKOWRON patch: remove double variables in copyfile() func
Wed, 22 Oct 2008 13:14:52 +0200 Dirkjan Ochtman patch/diff: use a separate function to write the first line of a file diff
Wed, 22 Oct 2008 12:56:28 +0200 Dirkjan Ochtman patch: consolidate two different regexes for parsing of git diffs
Wed, 22 Oct 2008 09:29:26 +0200 Dirkjan Ochtman patch: extract local function addmodehdr
Mon, 20 Oct 2008 14:57:04 +0200 Dirkjan Ochtman clean up trailing spaces, leading spaces in C
Sat, 18 Oct 2008 23:45:46 +0200 Patrick Mezard patch: pass linereader to binaryhunk.extract() instead of wrapped fp
Sat, 18 Oct 2008 23:45:46 +0200 Patrick Mezard patch: pass linereader to scangitpatch(), extract from iterhunks()
Sat, 18 Oct 2008 23:45:45 +0200 Patrick Mezard patch: change functions definition order for readability
Sat, 18 Oct 2008 23:45:45 +0200 Patrick Mezard patch: map changed files to patchmeta directly
Sat, 18 Oct 2008 23:45:45 +0200 Patrick Mezard patch: patchmeta gives (islink, isexec) tuple instead of int mode
Sat, 18 Oct 2008 23:45:45 +0200 Patrick Mezard patch: extract and rename gitpatch into patchmeta, document
Sat, 18 Oct 2008 23:45:45 +0200 Patrick Mezard patch: remove applydiff() useless updatedir and rejmerge arguments
Sun, 05 Oct 2008 21:35:26 +0200 Dirkjan Ochtman python2.6: use subprocess if available
Sun, 12 Oct 2008 15:21:08 -0500 Matt Mackall diff: pass contexts to status
Sun, 31 Aug 2008 16:12:02 +0200 Martin Geisler i18n: mark strings for translation in Mercurial
Sun, 31 Aug 2008 16:12:02 +0200 Martin Geisler i18n: avoid naive plural tricks
Sun, 31 Aug 2008 11:41:52 +0200 Dirkjan Ochtman fix double indentation and trailing whitespace
Tue, 12 Aug 2008 17:47:08 +0200 Dirkjan Ochtman merge with crew-stable
Sun, 10 Aug 2008 21:55:06 -0500 Matt Mackall util: set_flags shouldn't know about repo flag formats
Wed, 02 Jul 2008 09:21:57 +0200 Dirkjan Ochtman merge with crew-stable
Wed, 25 Jun 2008 14:13:20 -0700 Brendan Cully Check that git patches only touch files under root
Fri, 27 Jun 2008 18:28:45 -0500 Matt Mackall util: add sort helper
Fri, 27 Jun 2008 13:43:29 -0500 Matt Mackall status: clean up all users for unknown files
Wed, 25 Jun 2008 14:13:20 -0700 Brendan Cully Check that git patches only touch files under root
Thu, 26 Jun 2008 14:35:46 -0500 Matt Mackall use repo[changeid] to get a changectx
Thu, 26 Jun 2008 13:46:34 -0500 Matt Mackall simplify flag handling
Thu, 26 Jun 2008 13:46:29 -0500 Matt Mackall use repo.changectx(None) to get a workingctx
Wed, 25 Jun 2008 17:34:28 -0500 Matt Mackall use repo.changectx rather than context.changectx
Mon, 12 May 2008 11:37:08 -0500 Matt Mackall match: remove files arg from repo.status and friends
Mon, 12 May 2008 11:37:08 -0500 Matt Mackall match: remove files argument from patch.diff
Fri, 11 Apr 2008 15:14:00 +0200 Adrian Buehlmann removing unused local ccache in patch.diff
Sat, 12 Apr 2008 23:05:51 -0400 Benoit Boissinot merge with -stable
Sat, 12 Apr 2008 22:41:07 -0400 Benoit Boissinot fix import with -p0
Fri, 04 Apr 2008 22:36:40 +0200 Dirkjan Ochtman python 2.6 compatibility: compatibility wrappers for hash functions
Fri, 04 Apr 2008 22:15:14 +0200 Patrick Mezard Let --unified default to diff.unified (issue 1076)
Mon, 17 Mar 2008 23:36:45 +0100 Patrick Mezard patch: fix corner case with update + copy patch handling (issue 937)
Sun, 16 Mar 2008 00:35:12 +0100 Patrick Mezard patch: check filename is /dev/null for creation or deletion (issue 1033)
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall diff: use copy smarts from copies.py
Thu, 06 Mar 2008 22:23:26 +0100 Joel Rosdahl Expand import * to allow Pyflakes to find problems
Thu, 28 Feb 2008 00:07:37 +0100 Patrick Mezard patch: fix iterhunks() with trailing binary file removal
Wed, 06 Feb 2008 19:57:52 -0800 Bryan O'Sullivan Merge with crew
Thu, 26 Jul 2007 07:56:04 -0400 jorendorff commands.py, patch.py: add -U option to hg diff command
Fri, 18 Jan 2008 10:48:25 -0600 Matt Mackall transform a bunch of print statements to appropriate ui calls
Sat, 12 Jan 2008 20:49:07 +0100 Patrick Mezard Merge with crew-stable
Sat, 12 Jan 2008 19:35:11 +0100 Patrick Mezard patch: handle empty vs no file in git patches (issue906)
Sat, 12 Jan 2008 20:43:09 +0100 Patrick Mezard patch: remove CRLF when parsing file names
Sat, 29 Dec 2007 19:49:48 +0100 Thomas Arendsen Hein Removed tabs and trailing whitespace in python files
Thu, 27 Dec 2007 22:29:21 -0600 Matt Mackall patch: use util.set_flags
Tue, 25 Dec 2007 22:23:58 +0100 Patrick Mezard Merge with crew-stable
Tue, 25 Dec 2007 22:21:51 +0100 Patrick Mezard patch: be more tolerant to diffstat failures (issue 865)
Mon, 17 Dec 2007 23:42:48 +0100 Patrick Mezard patch: simplify directory creation
Mon, 17 Dec 2007 23:42:46 +0100 Patrick Mezard patch: write rej files for missing targets (issue 853)
Mon, 17 Dec 2007 23:06:04 +0100 Patrick Mezard patch: avoid file existence tests when possible in selectfile()
Mon, 17 Dec 2007 23:06:01 +0100 Patrick Mezard patch: move diff parsing in iterhunks generator
Mon, 17 Dec 2007 22:19:21 +0100 Patrick Mezard patch: move NoHunk detection up with parsing code
Sun, 02 Dec 2007 13:53:29 +0100 Patrick Mezard mq: missing target files do not make qpush to fail immediately (issue 835)
Sun, 25 Nov 2007 11:49:34 +0100 Jim Hague patch: fix sort() comparator argument
Thu, 01 Nov 2007 12:17:59 -0700 Dustin Sallings Use both the from and to name in mdiff.unidiff.
Thu, 01 Nov 2007 12:05:14 +0100 Patrick Mezard Fix Windows os.popen bug with interleaved stdout/stderr output
Thu, 25 Oct 2007 19:40:56 +0200 Thomas Arendsen Hein Only set mode of new patch if the target file was removed before.
Mon, 08 Oct 2007 22:20:23 +0200 Patrick Mezard patch: fix git sendmail handling without proper mail headers
Sat, 06 Oct 2007 15:30:15 -0300 Alexis S. L. Carvalho Always copy the necessary files before applying a git patch
Tue, 28 Aug 2007 23:02:41 -0300 Alexis S. L. Carvalho Avoid a working dir walk while trying to detect copies for diff --git
Tue, 28 Aug 2007 22:48:25 -0300 Alexis S. L. Carvalho Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Tue, 07 Aug 2007 10:28:43 +0200 Thomas Arendsen Hein Remove trailing spaces, fix indentation
Sat, 04 Aug 2007 23:07:52 -0700 Brendan Cully patch: add git symlink support
Tue, 31 Jul 2007 16:28:05 -0700 Bryan O'Sullivan patch: make internal code a bit friendlier to use
Mon, 30 Jul 2007 20:49:08 -0700 Bryan O'Sullivan patch: remove unused parameter from b85diff
Sat, 21 Jul 2007 16:44:38 -0500 Matt Mackall Merge with crew
Tue, 17 Jul 2007 23:35:24 +0200 Patrick Mezard patch: patches should be read and written in binary mode when possible.
Tue, 17 Jul 2007 23:34:52 +0200 Patrick Mezard patch: fix normalized paths separators.
Sat, 21 Jul 2007 16:02:10 -0500 Matt Mackall Make repo locks recursive, eliminate all passing of lock/wlock
Tue, 17 Jul 2007 09:39:30 -0700 Bryan O'Sullivan patch.py: re-add the ability to use an external patch program
Tue, 17 Jul 2007 09:39:30 -0700 Bryan O'Sullivan patch.py: don't mark files as changed unless they have actually been changed
Tue, 17 Jul 2007 09:39:30 -0700 Bryan O'Sullivan patch.py: fix some incorrect uses of _() for i18n
Tue, 17 Jul 2007 09:39:30 -0700 Bryan O'Sullivan Add Chris Mason's mpatch library.
Mon, 02 Jul 2007 13:26:12 -0700 Brendan Cully patch.extract: fix test-import breakage introduced in the previous changeset
Mon, 02 Jul 2007 10:59:16 -0700 Brendan Cully patch.extract: do not prepend subject if the description already starts with it
Thu, 21 Jun 2007 09:25:49 +0200 Thomas Arendsen Hein Kill trailing spaces
Tue, 19 Jun 2007 17:02:07 +0200 Patrick Mezard patch: fix ui.patch regression introduced by 62019c4427e3.
Wed, 06 Jun 2007 20:22:52 +0200 Thomas Arendsen Hein Removed trailing whitespace and tabs from python files
Sun, 03 Jun 2007 14:38:52 -0300 Alexis S. L. Carvalho patch.diff: avoid calling workingctx().manifest()
Sun, 27 May 2007 14:43:29 -0700 Bryan O'Sullivan Automated merge with http://hg.intevation.org/mercurial/crew
Sun, 27 May 2007 14:26:54 -0700 Bryan O'Sullivan Introduce find_exe. Use instead of find_in_path for programs.
Thu, 17 May 2007 20:09:47 -0700 Eric Hopper Add ability to parse branch information to hg import
Thu, 10 May 2007 13:42:36 -0700 Eric Hopper Add branch information to hg export.
Sat, 12 May 2007 21:09:31 +0200 Patrick Mezard Add ui.patch option.
Sat, 12 May 2007 21:09:29 +0200 Patrick Mezard Fix issue483 - mq does not work under windows with gnu-win32 patch.
Sat, 07 Apr 2007 04:45:27 -0300 Alexis S. L. Carvalho Merge with crew-stable.
Sat, 07 Apr 2007 04:27:55 -0300 Alexis S. L. Carvalho Try to find diffstat in PATH before calling it
Thu, 22 Mar 2007 10:44:59 -0700 Brendan Cully Add import --exact.
Fri, 16 Mar 2007 00:45:18 -0300 Alexis S. L. Carvalho Merge with crew-stable
Fri, 16 Mar 2007 00:22:57 -0300 Alexis S. L. Carvalho pass repo.root to util.pathto() in preparation for the next patch
Wed, 14 Mar 2007 11:46:07 -0700 Brendan Cully git-send-email compatibility: stop reading changelog after ^---$
Tue, 13 Mar 2007 21:54:34 -0700 Brendan Cully Make [PATCH] removal slightly more robust
Mon, 12 Mar 2007 13:58:06 -0700 Brendan Cully Strip [PATCH...] from message subject when importing patches
Sat, 10 Mar 2007 23:21:33 -0300 Alexis S. L. Carvalho Merge a bunch of matcher and locate fixes.
Sat, 10 Mar 2007 23:00:43 -0300 Alexis S. L. Carvalho remove obsolete code from patch.diff
Fri, 02 Mar 2007 14:03:30 -0800 Brendan Cully Suppress <stdout> before hg export -v (regression from previous patch).
Thu, 01 Mar 2007 20:53:38 -0800 Brendan Cully Let patch.export handle any fp-like object
Tue, 20 Feb 2007 20:55:23 +0100 Thomas Arendsen Hein merge with crew-stable
Sat, 17 Feb 2007 09:55:00 -0200 Alexis S. L. Carvalho git binary patches: don't print the header for identical files
Sat, 17 Feb 2007 09:54:59 -0200 Alexis S. L. Carvalho git binary patches: use hashes to detect identical files
Fri, 16 Feb 2007 05:27:37 -0200 Alexis S. L. Carvalho merge with crew-stable
Fri, 16 Feb 2007 04:54:46 -0200 Alexis S. L. Carvalho git patches: handle renames of binary files
Fri, 29 Dec 2006 20:04:31 -0600 Matt Mackall symlinks: add flags param to wwrite
Fri, 29 Dec 2006 20:04:30 -0600 Matt Mackall exec: add execfunc to simplify exec flag support on non-exec filesystems
Tue, 26 Dec 2006 03:12:23 +0100 Benoit Boissinot commands.py: use contexts in export
Mon, 25 Dec 2006 17:43:49 +0100 Benoit Boissinot patch: use contexts for diff
Mon, 25 Dec 2006 13:37:00 +0100 Benoit Boissinot remove various unused import
Fri, 15 Dec 2006 18:38:09 -0800 Brendan Cully Merge with crew-stable
Fri, 15 Dec 2006 19:30:20 +0100 Thomas Arendsen Hein Don't use node length for calculating revision number length.
Fri, 15 Dec 2006 19:09:10 +0100 Thomas Arendsen Hein Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thu, 14 Dec 2006 20:25:19 -0600 Matt Mackall Simplify i18n imports
Wed, 13 Dec 2006 13:27:09 -0600 Matt Mackall Replace demandload with new demandimport
Mon, 27 Nov 2006 22:03:36 -0200 Alexis S. L. Carvalho handle files with more than one git binary patch
Mon, 27 Nov 2006 22:03:31 -0200 Alexis S. L. Carvalho handle files with both git binary patches and copy/rename ops
Mon, 20 Nov 2006 19:32:46 -0200 Alexis S. L. Carvalho Don't generate git patches that rename a file to multiple destinations
Mon, 20 Nov 2006 19:32:45 -0200 Alexis S. L. Carvalho handle git patches that rename a file to more than one destination
Mon, 20 Nov 2006 19:32:38 -0200 Alexis S. L. Carvalho diff: better detection of renames when comparing with the working dir.
Mon, 20 Nov 2006 19:32:37 -0200 Alexis S. L. Carvalho fix typo in mercurial/patch.py
Mon, 20 Nov 2006 19:32:36 -0200 Alexis S. L. Carvalho renamedbetween: only return (file, node) pairs that exist in the original rev
Mon, 20 Nov 2006 19:32:35 -0200 Alexis S. L. Carvalho diff: improve detection of renames when diffing across many revisions
Fri, 17 Nov 2006 08:06:54 +0100 Thomas Arendsen Hein white space and line break cleanups
Mon, 13 Nov 2006 13:26:57 -0600 Matt Mackall util: add copyfile function
Mon, 30 Oct 2006 16:10:58 -0800 Brendan Cully git patch: create empty added files
Thu, 26 Oct 2006 19:25:45 +0200 Alexis S. L. Carvalho add untrusted argument to patch.diffopts
Thu, 19 Oct 2006 14:16:51 +0200 Benoit Boissinot use xrange instead of range
Wed, 18 Oct 2006 10:37:34 -0700 Brendan Cully patch: return list of modified files even when an exception is raised
Fri, 13 Oct 2006 15:34:35 -0300 Alexis S. L. Carvalho use short hashes with diff -v
Thu, 12 Oct 2006 16:34:32 -0700 Brendan Cully Add popen2 demandload to patch.py, required by diffstat
Thu, 12 Oct 2006 13:39:14 -0700 Brendan Cully Use line length field when extracting git binary patches
Thu, 12 Oct 2006 09:17:16 -0700 Brendan Cully Add git-1.4 binary patch support
Tue, 10 Oct 2006 14:48:26 -0700 Brendan Cully Don't generate git diff header for empty diffs
Mon, 02 Oct 2006 21:10:31 +0200 Benoit Boissinot fix warnings from pychecker
Sun, 01 Oct 2006 19:26:33 +0200 Thomas Arendsen Hein Whitespace/Tab cleanup
Tue, 26 Sep 2006 00:05:24 +0100 Stephen Darnell Add -D/--nodates options to hg diff/export that removes dates from diff headers
Tue, 26 Sep 2006 13:58:58 +0200 Benoit Boissinot fix users of dirstate.copies broken by b1f10d3223c1
Wed, 13 Sep 2006 13:14:08 -0700 Matt Doar Add support for diffstat in commit emails, and move diffstat from
Thu, 07 Sep 2006 14:12:39 +0200 Benoit Boissinot git --diff: fix traceback when getting mode change
Tue, 05 Sep 2006 01:11:14 +0200 Benoit Boissinot unlink temporary patch files even when an exception is raised
Wed, 30 Aug 2006 13:42:57 -0700 Brendan Cully Remove temporary git patch files
Wed, 30 Aug 2006 13:12:26 -0700 Brendan Cully Fix git patch application when cwd != repo.root
Fri, 18 Aug 2006 17:02:38 -0700 Vadim Gelfer merge.
Thu, 17 Aug 2006 21:13:35 +0300 Giorgos Keramidas add missing import of errno
Wed, 16 Aug 2006 19:49:45 -0700 Brendan Cully Teach mq about git patches
Wed, 16 Aug 2006 19:46:18 -0700 Brendan Cully Move import's working dir update code into patch.updatedir
Wed, 16 Aug 2006 10:52:42 -0700 Vadim Gelfer override previous merge with mpm.
Wed, 16 Aug 2006 10:52:19 -0700 Vadim Gelfer redo merge with mpm.
Wed, 16 Aug 2006 10:46:24 -0700 Vadim Gelfer merge with mpm.
Tue, 15 Aug 2006 11:28:50 -0700 Brendan Cully Unify mq and hg patch invocation.
Mon, 14 Aug 2006 22:48:03 -0700 Brendan Cully Add diff --git option
Tue, 15 Aug 2006 11:34:08 -0500 Matt Mackall Move ui.diffopts to patch.diffopts where it belongs
Sun, 13 Aug 2006 15:24:30 -0700 Vadim Gelfer fix patch.patch.filterfiles.
Sat, 12 Aug 2006 16:40:12 -0700 Vadim Gelfer remove localrepository.changes.
Sat, 12 Aug 2006 16:13:27 -0700 Vadim Gelfer refactor text diff/patch code.
Sat, 12 Aug 2006 15:41:26 -0700 Vadim Gelfer util: qualify name properly.
Sat, 12 Aug 2006 13:16:48 -0700 Vadim Gelfer commands.import: refactor patch parsing into patch.extract.
Sat, 12 Aug 2006 12:47:18 -0700 Vadim Gelfer merge git patch code.
Fri, 11 Aug 2006 16:55:48 -0700 Brendan Cully Remove debugging line
Fri, 11 Aug 2006 15:50:16 -0700 Brendan Cully Move patch-related code into its own module.
less more | (0) tip