| Mon, 21 Feb 2022 13:08:28 -0700 |
Gregory Szorc |
py3: use class X: instead of class X(object):
|
file |
diff |
annotate
|
| Thu, 03 Mar 2022 17:34:00 +0100 |
Gregory Szorc |
py2: remove simple from __future__ statements
|
file |
diff |
annotate
|
| Tue, 28 Sep 2021 15:11:22 -0700 |
Martin von Zweigbergk |
errors: raise InputError from revsingle() iff revset provided by the user
|
file |
diff |
annotate
|
| Tue, 28 Sep 2021 13:59:01 -0700 |
Martin von Zweigbergk |
errors: raise InputError from revpair() iff revset provided by the user
|
file |
diff |
annotate
|
| Tue, 30 Mar 2021 02:32:30 +0200 |
Joerg Sonnenberger |
refactor: prefer checks against nullrev over nullid
|
file |
diff |
annotate
|
| Wed, 16 Dec 2020 21:06:29 -0800 |
Martin von Zweigbergk |
extdiff: add --from/--to and deprecate -r, as was done for `hg diff`
|
file |
diff |
annotate
|
| Wed, 16 Dec 2020 22:30:07 -0800 |
Martin von Zweigbergk |
extdiff: fix crash when showing diff from wdir()
|
file |
diff |
annotate
|
| Wed, 16 Dec 2020 22:16:05 -0800 |
Martin von Zweigbergk |
extdiff: pass contexts instead of nodeids into diffrevs()
|
file |
diff |
annotate
|
| Fri, 27 Nov 2020 17:03:29 -0500 |
Augie Fackler |
formating: upgrade to black 20.8b1
|
file |
diff |
annotate
|
| Wed, 02 Sep 2020 19:46:55 +0530 |
Pulkit Goyal |
extdiff: refactor cmdline and gui calculation login in a separate fn
|
file |
diff |
annotate
|
| Wed, 02 Sep 2020 19:17:31 +0530 |
Pulkit Goyal |
extdiff: reorder an if-else conditional
|
file |
diff |
annotate
|
| Sat, 29 Aug 2020 14:35:18 +0530 |
Pulkit Goyal |
extdiff: move single file handling inside `not per-file` conditional
|
file |
diff |
annotate
|
| Sat, 29 Aug 2020 14:32:26 +0530 |
Pulkit Goyal |
extdiff: remove dir2root and pass full path as dir2 in _runperfilediff()
|
file |
diff |
annotate
|
| Sat, 29 Aug 2020 14:28:34 +0530 |
Pulkit Goyal |
extdiff: pass full paths of `dir1a` and `dir1b` to `_runperfilediff()`
|
file |
diff |
annotate
|
| Tue, 07 Jul 2020 14:01:12 +0530 |
Pulkit Goyal |
extdiff: add some comments in diffrevs()
|
file |
diff |
annotate
|
| Tue, 07 Jul 2020 13:26:57 +0530 |
Pulkit Goyal |
extdiff: add comments and minor variable renames diffpatch()
|
file |
diff |
annotate
|
| Tue, 07 Jul 2020 13:24:13 +0530 |
Pulkit Goyal |
extdiff: remove unrequired do3way argument to diffpatch()
|
file |
diff |
annotate
|
| Tue, 07 Jul 2020 13:13:18 +0530 |
Pulkit Goyal |
extdiff: refactor logic to diff revs of versions of files
|
file |
diff |
annotate
|
| Tue, 07 Jul 2020 12:42:39 +0530 |
Pulkit Goyal |
extdiff: refactor logic which does diff of patches
|
file |
diff |
annotate
|
| Fri, 29 May 2020 03:56:07 +0200 |
Manuel Jacob |
cleanup: eliminate procutil.quotecommand()
|
file |
diff |
annotate
|
| Fri, 08 May 2020 08:50:47 -0700 |
Martin von Zweigbergk |
diff: use cmdutil.check_at_most_one_arg() for checking --rev/--change
|
file |
diff |
annotate
|
| Tue, 03 Dec 2019 17:17:57 -0800 |
Kyle Lippincott |
py3: make a pycompat.osdevnull, use it in extdiff
|
file |
diff |
annotate
|
| Thu, 14 Nov 2019 15:24:22 -0500 |
Augie Fackler |
extdiff: use field names instead of field numbers on scmutil.status
|
file |
diff |
annotate
|
| Fri, 08 Nov 2019 11:19:20 -0800 |
Augie Fackler |
cleanup: remove pointless r-prefixes on single-quoted strings
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:48:39 -0400 |
Augie Fackler |
formatting: byteify all mercurial/ and hgext/ string literals
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:45:02 -0400 |
Augie Fackler |
formatting: blacken the codebase
|
file |
diff |
annotate
|
| Sat, 02 Feb 2019 21:58:49 -0800 |
Ludovic Chabant |
extdiff: support tools that can be run simultaneously
|
file |
diff |
annotate
|
| Tue, 29 Jan 2019 22:59:15 -0800 |
Ludovic Chabant |
extdiff: add --per-file and --confirm options
|
file |
diff |
annotate
|
| Thu, 10 Jan 2019 20:22:03 -0800 |
Ludovic Chabant |
extdiff: move external tool command line building into separate function
|
file |
diff |
annotate
|
| Tue, 04 Dec 2018 17:13:01 -0500 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|
| Mon, 03 Dec 2018 12:48:42 -0500 |
Matt Harbison |
extdiff: avoid double backslashes in the displayed tool path on Windows
|
file |
diff |
annotate
|
| Tue, 05 Sep 2017 15:21:21 -0700 |
Martin von Zweigbergk |
archive: change "matcnfn" argument to a real matcher
|
file |
diff |
annotate
|
| Mon, 03 Dec 2018 20:59:48 -0500 |
Matt Harbison |
extdiff: register the configuration generated commands with a help category
stable
|
file |
diff |
annotate
|
| Sat, 13 Oct 2018 02:17:41 -0700 |
rdamazio |
help: assigning categories to existing commands
|
file |
diff |
annotate
|
| Sat, 26 May 2018 12:20:36 +0900 |
Yuya Nishihara |
py3: wrap tempfile.mkdtemp() to use bytes path
|
file |
diff |
annotate
|
| Thu, 12 Apr 2018 23:13:55 +0900 |
Yuya Nishihara |
export: enable formatter support (API)
|
file |
diff |
annotate
|
| Sat, 31 Mar 2018 23:38:53 -0700 |
Martin von Zweigbergk |
extdiff: use context-returning revpair()
|
file |
diff |
annotate
|
| Sat, 31 Mar 2018 23:37:25 -0700 |
Martin von Zweigbergk |
scmutil: introduce deprecated alias for revpair()
|
file |
diff |
annotate
|
| Fri, 30 Mar 2018 12:16:46 -0700 |
Kyle Lippincott |
extdiff: document that it copies modified files back to working directory
|
file |
diff |
annotate
|
| Sat, 24 Mar 2018 15:10:51 +0900 |
Yuya Nishihara |
procutil: bulk-replace function calls to point to new module
|
file |
diff |
annotate
|
| Thu, 22 Mar 2018 21:56:20 +0900 |
Yuya Nishihara |
stringutil: bulk-replace call sites to point to new module
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 12:30:20 -0500 |
Augie Fackler |
cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime
|
file |
diff |
annotate
|
| Sat, 17 Feb 2018 18:20:15 +0900 |
Yuya Nishihara |
py3: make test-extdiff.t pass on Python 3
|
file |
diff |
annotate
|
| Sat, 17 Feb 2018 18:15:37 +0900 |
Yuya Nishihara |
py3: make regexp patterns bytes in extdiff
|
file |
diff |
annotate
|
| Sat, 17 Feb 2018 18:14:51 +0900 |
Yuya Nishihara |
py3: fix bytes-unicode dance while building docstring of extdiff
|
file |
diff |
annotate
|
| Thu, 02 Apr 2015 23:32:28 +0900 |
Yuya Nishihara |
cmdutil: pass ctx to makefilename() in place of repo/node pair (API)
|
file |
diff |
annotate
|
| Mon, 23 Oct 2017 00:02:07 +0530 |
Pulkit Goyal |
py3: handle keyword arguments in hgext/extdiff.py
|
file |
diff |
annotate
|
| Sat, 14 Oct 2017 00:34:46 +0200 |
Boris Feld |
configitems: register the 'extdata.*.diffargs' config
|
file |
diff |
annotate
|
| Sat, 14 Oct 2017 00:33:57 +0200 |
Boris Feld |
configitems: register the 'exdiff.opts.*' config
|
file |
diff |
annotate
|
| Sat, 20 May 2017 20:15:05 -0400 |
Augie Fackler |
cmdutil: rename template param to export to fntemplate
|
file |
diff |
annotate
|
| Sun, 14 May 2017 16:19:47 +0900 |
Yuya Nishihara |
commands: move templates of common command options to cmdutil (API)
|
file |
diff |
annotate
|
| Sat, 09 Jan 2016 23:07:20 +0900 |
Yuya Nishihara |
registrar: move cmdutil.command to registrar module (API)
|
file |
diff |
annotate
|
| Thu, 11 May 2017 22:33:45 -0400 |
Matt Harbison |
extdiff: copy back execbit-only changes to the working directory
|
file |
diff |
annotate
|
| Sat, 06 May 2017 23:00:57 -0400 |
Matt Harbison |
extdiff: copy back files to the working directory if the size changed
|
file |
diff |
annotate
|
| Wed, 15 Mar 2017 23:06:50 +0900 |
Yuya Nishihara |
util: wrap s.encode('string_escape') call for future py3 compatibility
|
file |
diff |
annotate
|
| Wed, 15 Feb 2017 13:34:06 -0800 |
Simon Farnsworth |
extdiff: log time spent in external diff program
|
file |
diff |
annotate
|
| Sun, 25 Dec 2016 03:06:55 +0530 |
Pulkit Goyal |
py3: have a bytes version of shlex.split()
|
file |
diff |
annotate
|
| Tue, 23 Aug 2016 11:26:08 -0400 |
Augie Fackler |
extensions: change magic "shipped with hg" string
|
file |
diff |
annotate
|
| Wed, 27 Jul 2016 21:44:49 +0900 |
Yuya Nishihara |
extdiff: isolate path variable of saved command to independent paragraph
|
file |
diff |
annotate
|
| Wed, 27 Jul 2016 21:42:24 +0900 |
Yuya Nishihara |
extdiff: export __doc__ of saved command for translation
|
file |
diff |
annotate
|
| Wed, 27 Jul 2016 21:40:42 +0900 |
Yuya Nishihara |
extdiff: refactor closure of saved diff command as a top-level class
|
file |
diff |
annotate
|
| Mon, 18 Jul 2016 16:25:35 -0500 |
Matt Mackall |
extdiff: escape path for docstring (issue5301)
stable
|
file |
diff |
annotate
|
| Sun, 17 Apr 2016 02:15:05 +0530 |
Pulkit Goyal |
py3: make extdiff use absolute_import
|
file |
diff |
annotate
|
| Fri, 01 Jan 2016 22:35:34 +0900 |
Yuya Nishihara |
extdiff: use @command decorator to set up diff commands
|
file |
diff |
annotate
|
| Mon, 04 Jan 2016 22:13:46 +0900 |
Yuya Nishihara |
extdiff: factor out list of common options
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 12:55:45 -0700 |
Pierre-Yves David |
error: get Abort from 'error' instead of 'util'
|
file |
diff |
annotate
|
| Wed, 09 Sep 2015 22:27:48 -0400 |
Matt Harbison |
extdiff: enable -I/-X with --patch
|
file |
diff |
annotate
|
| Wed, 09 Sep 2015 21:07:38 -0400 |
Matt Harbison |
extdiff: add a --patch argument for diffing changeset deltas
|
file |
diff |
annotate
|
| Wed, 09 Sep 2015 20:48:09 -0400 |
Matt Harbison |
extdiff: prepare sections of dodiff() for conditionalizing
|
file |
diff |
annotate
|
| Mon, 27 Jul 2015 17:39:09 -0400 |
Matt Harbison |
extdiff: allow modifications in subrepos to be copied back
stable
|
file |
diff |
annotate
|
| Sun, 15 Jul 2012 12:43:10 -0400 |
Matt Harbison |
extdiff: add support for subrepos
|
file |
diff |
annotate
|
| Wed, 11 Jul 2012 20:48:51 -0400 |
Matt Harbison |
extdiff: use archiver to take snapshots of committed revisions
|
file |
diff |
annotate
|
| Tue, 28 Apr 2015 16:44:37 -0400 |
Augie Fackler |
extensions: document that `testedwith = 'internal'` is special
|
file |
diff |
annotate
|
| Fri, 27 Feb 2015 17:35:07 -0500 |
Jordi Gutiérrez Hermoso |
extdiff: expand tildes and variables in paths to user-supplied diff programs
|
file |
diff |
annotate
|
| Wed, 28 Jan 2015 02:28:39 +0100 |
Mads Kiilerich |
extdiff: reintroduce backward compatibility with manual quoting of parameters
stable
|
file |
diff |
annotate
|
| Thu, 25 Dec 2014 23:33:26 +0900 |
FUJIWARA Katsunori |
extdiff: rename the name of an argument for readability
|
file |
diff |
annotate
|
| Thu, 25 Dec 2014 23:33:26 +0900 |
FUJIWARA Katsunori |
extdiff: avoid unexpected quoting arguments for external tools (issue4463)
|
file |
diff |
annotate
|
| Sat, 08 Nov 2014 13:06:22 +0900 |
Yuya Nishihara |
util.system: use ui.system() in place of optional ui.fout parameter
|
file |
diff |
annotate
|
| Mon, 03 Nov 2014 16:56:32 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sun, 02 Nov 2014 15:27:15 -0500 |
Matt Harbison |
extdiff: drop the command alias without options example in the help text
|
file |
diff |
annotate
|
| Fri, 31 Oct 2014 21:34:55 -0400 |
Matt Harbison |
extdiff: allow a preconfigured merge-tool to be invoked
|
file |
diff |
annotate
|
| Mon, 03 Nov 2014 16:30:21 -0600 |
Matt Mackall |
extdiff: sort files when snapshotting
|
file |
diff |
annotate
|
| Thu, 26 Jul 2012 11:38:13 +0100 |
Michael Fyles |
extdiff: quote user-supplied options passed to shell
stable
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 04:37:45 +0200 |
Mads Kiilerich |
cleanup: remove some unused / duplicate imports
|
file |
diff |
annotate
|
| Sun, 04 May 2014 22:29:27 -0700 |
Gregory Szorc |
extdiff: define inferrepo in command decorator
|
file |
diff |
annotate
|
| Sun, 04 May 2014 21:54:01 -0700 |
Gregory Szorc |
extdiff: declare command using decorator
|
file |
diff |
annotate
|
| Wed, 12 Mar 2014 13:13:42 -0400 |
Augie Fackler |
extdiff: move from dict() construction to {} literals
|
file |
diff |
annotate
|
| Tue, 16 Oct 2012 11:43:15 -0700 |
Siddharth Agarwal |
commands: don't infer repo for commands like update (issue2748)
|
file |
diff |
annotate
|
| Wed, 15 Aug 2012 22:38:42 +0200 |
Mads Kiilerich |
fix trivial spelling errors
|
file |
diff |
annotate
|
| Tue, 15 May 2012 14:37:49 -0500 |
Augie Fackler |
hgext: mark all first-party extensions as such
|
file |
diff |
annotate
|
| Sat, 12 May 2012 16:00:57 +0200 |
Brodie Rao |
cleanup: "not x in y" -> "x not in y"
|
file |
diff |
annotate
|
| Mon, 12 Mar 2012 09:39:30 +0100 |
Thomas Arendsen Hein |
extdiff: escape filenames with vim/DirDiff and make quoting work with Windows
stable
|
file |
diff |
annotate
|
| Fri, 24 Jun 2011 17:04:37 +0300 |
Idan Kamara |
extdiff: use ui out descriptor when calling util.system
stable
|
file |
diff |
annotate
|
| Sat, 18 Jun 2011 16:52:51 -0500 |
Matt Mackall |
scmutil: switch match users to supplying contexts
|
file |
diff |
annotate
|
| Sun, 15 May 2011 18:00:22 +0100 |
Javi Merino |
extdiff: grammar "allows to" -> "allows one to"
|
file |
diff |
annotate
|
| Fri, 13 May 2011 14:58:24 -0500 |
Matt Mackall |
scmutil: drop aliases in cmdutil for match functions
|
file |
diff |
annotate
|
| Fri, 13 May 2011 14:06:28 -0500 |
Matt Mackall |
scmutil: move revsingle/pair/range from cmdutil
|
file |
diff |
annotate
|
| Fri, 06 May 2011 15:22:31 +0200 |
Adrian Buehlmann |
rename util.set_flags to setflags
|
file |
diff |
annotate
|
| Mon, 02 May 2011 10:11:18 +0200 |
Dan Villiom Podlaski Christiansen |
prevent transient leaks of file handle by using new helper functions
|
file |
diff |
annotate
|
| Wed, 27 Apr 2011 21:55:46 -0400 |
Steven Stallion |
extdiff: add repository root as a variable
|
file |
diff |
annotate
|
| Fri, 29 Apr 2011 11:10:11 +0200 |
Thomas Arendsen Hein |
merge with stable
|
file |
diff |
annotate
|
| Fri, 29 Apr 2011 08:04:46 +0200 |
Patrick Mezard |
extdiff: fix broken symlinks handling (issue1909)
stable
|
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
|
| Mon, 21 Mar 2011 17:03:16 +0100 |
jfh |
extdiff: use absolute paths for any temporary files
|
file |
diff |
annotate
|
| Tue, 15 Mar 2011 17:50:02 -0400 |
David Wolever |
Updating hgext.extdiff to use revsets
|
file |
diff |
annotate
|
| Sun, 06 Jun 2010 17:25:00 +0900 |
FUJIWARA Katsunori |
help: show value requirement and multiple occurrence of options
|
file |
diff |
annotate
|
| Mon, 17 May 2010 23:11:27 +0200 |
Martin Geisler |
extdiff: fix reST syntax in module docstring
|
file |
diff |
annotate
|
| Thu, 07 Jan 2010 22:19:05 -0600 |
Steve Borho |
extdiff: add labels, read diff arguments from [merge-tools]
|
file |
diff |
annotate
|
| Mon, 08 Feb 2010 15:36:34 +0100 |
Benoit Boissinot |
fix coding style (reported by pylint)
|
file |
diff |
annotate
|
| Mon, 25 Jan 2010 00:05:27 -0600 |
Matt Mackall |
many, many trivial check-code fixups
|
file |
diff |
annotate
|
| Tue, 19 Jan 2010 22:45:09 -0600 |
Matt Mackall |
Merge with stable
|
file |
diff |
annotate
|
| Tue, 19 Jan 2010 22:20:08 -0600 |
Matt Mackall |
Update license to GPLv2+
stable
|
file |
diff |
annotate
|
| Mon, 30 Nov 2009 19:52:03 +0100 |
Sune Foldager |
merge with stable
|
file |
diff |
annotate
|
| Mon, 30 Nov 2009 19:37:38 +0100 |
Sune Foldager |
extdiff: respect --option in command aliases (issue949)
stable
|
file |
diff |
annotate
|
| Thu, 26 Nov 2009 23:10:59 +0100 |
Martin Geisler |
extdiff: wrap long lines in docstring and comments
|
file |
diff |
annotate
|
| Thu, 26 Nov 2009 20:06:45 +0100 |
Martin Geisler |
extdiff: prevent exception on double-translation
stable
|
file |
diff |
annotate
|
| Sat, 03 Oct 2009 14:39:57 -0500 |
Matt Mackall |
Merge with -stable
|
file |
diff |
annotate
|
| Thu, 01 Oct 2009 08:50:10 +0200 |
Peter Arrenbrecht |
extdiff: fix defaulting to "diff" if no --program is given
|
file |
diff |
annotate
|
| Thu, 17 Sep 2009 21:12:32 +0200 |
Sune Foldager |
extdiff: add 3-way diff for merge changesets
|
file |
diff |
annotate
|