| Tue, 18 Jan 2022 15:04:55 -0800 |
Martin von Zweigbergk |
merge: set custom conflict label for base commit
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
file |
diff |
annotate
|
| Fri, 14 Jan 2022 09:28:44 -0800 |
Martin von Zweigbergk |
merge: consider the file merged when using :merge-{local,other}
|
file |
diff |
annotate
|
| Thu, 23 Sep 2021 09:42:20 -0700 |
Martin von Zweigbergk |
errors: use InputError for bad path arguments to `hg annotate`
|
file |
diff |
annotate
|
| Thu, 05 Aug 2021 12:53:44 +0200 |
Pierre-Yves David |
vfs: always use / as file separator (issue6546)
stable
|
file |
diff |
annotate
|
| Mon, 29 Mar 2021 01:52:06 +0200 |
Joerg Sonnenberger |
node: replace nullid and friends with nodeconstants class
|
file |
diff |
annotate
|
| Mon, 16 Nov 2020 16:00:50 -0800 |
Martin von Zweigbergk |
errors: use exit code 10 for parse errors
|
file |
diff |
annotate
|
| Mon, 16 Nov 2020 16:25:04 -0800 |
Martin von Zweigbergk |
errors: raise InputError when line range to followlines() is out of bounds
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 14:14:04 +0530 |
Pulkit Goyal |
commit: pass mergestate into _filecommit() instead of re-reading it
|
file |
diff |
annotate
|
| Tue, 07 Jul 2020 00:18:15 +0200 |
Pierre-Yves David |
commitctx: extract _filecommit too
|
file |
diff |
annotate
|
| Mon, 06 Jul 2020 19:35:53 +0200 |
Pierre-Yves David |
commitctx: return "touched" status from _filecommit
|
file |
diff |
annotate
|
| Mon, 06 May 2019 22:06:23 -0700 |
Martin von Zweigbergk |
tests: update annotate tests to work around simplemerge bug
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 23:22:54 -0700 |
Martin von Zweigbergk |
copies: calculate mergecopies() based on pathcopies()
|
file |
diff |
annotate
|
| Sun, 14 Apr 2019 13:46:40 -0700 |
Martin von Zweigbergk |
tests: make merge conflicts explicit in `hg annotate` tests
|
file |
diff |
annotate
|
| Wed, 27 Dec 2017 19:49:36 -0800 |
Martin von Zweigbergk |
copies: add config option for writing copy metadata to file and/or changset
|
file |
diff |
annotate
|
| Wed, 27 Dec 2017 22:31:00 -0800 |
Martin von Zweigbergk |
tests: migrate to new method for getting copy info
|
file |
diff |
annotate
|
| Sun, 27 Jan 2019 13:28:45 +0900 |
Yuya Nishihara |
revset: allow to parse single integer as a range
|
file |
diff |
annotate
|
| Sat, 26 Jan 2019 17:51:55 +0900 |
Yuya Nishihara |
dispatch: quote filename in IOError as well
|
file |
diff |
annotate
|
| Sun, 30 Sep 2018 15:35:17 +0900 |
Yuya Nishihara |
annotate: rename {line_number} to {lineno} (BC)
|
file |
diff |
annotate
|
| Sat, 15 Sep 2018 17:26:23 +0900 |
Yuya Nishihara |
annotate: pass in wdir rev and node to formatter (BC)
|
file |
diff |
annotate
|
| Tue, 18 Sep 2018 23:47:21 -0400 |
Matt Harbison |
tests: quote PYTHON usage
|
file |
diff |
annotate
|
| Sun, 05 Aug 2018 16:44:16 +0900 |
Yuya Nishihara |
formatter: rename {abspath}/{file} to {path}, and drop relative {path} (BC)
|
file |
diff |
annotate
|
| Mon, 18 Jun 2018 21:58:04 +0900 |
Yuya Nishihara |
formatter: look for template symbols from the associated name
|
file |
diff |
annotate
|
| Thu, 03 May 2018 12:04:36 +0900 |
Yuya Nishihara |
annotate: automatically populate fields referenced from template
|
file |
diff |
annotate
|
| Sat, 17 Mar 2018 23:34:38 +0900 |
Yuya Nishihara |
formatter: remove template resources from nested items before generating JSON
|
file |
diff |
annotate
|
| Thu, 15 Mar 2018 22:27:16 +0900 |
Yuya Nishihara |
formatter: make nested items somewhat readable in template output
|
file |
diff |
annotate
|
| Mon, 02 Apr 2018 15:55:50 -0700 |
Gregory Szorc |
tests: don't use revlog paths in tests
|
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
|
| Sun, 11 Mar 2018 21:36:28 +0900 |
Yuya Nishihara |
annotate: add support for template keywords and functions depending on ctx
|
file |
diff |
annotate
|
| Sat, 10 Mar 2018 16:55:54 +0900 |
Yuya Nishihara |
py3: silence f.write() in test-annotate.t
|
file |
diff |
annotate
|
| Tue, 06 Mar 2018 14:32:14 -0800 |
Gregory Szorc |
merge with stable
|
file |
diff |
annotate
|
| Sun, 04 Mar 2018 10:42:51 -0500 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|
| Sat, 03 Mar 2018 15:31:37 -0800 |
Ryan McElroy |
revsetlang: add a hint for more useful parse errors
|
file |
diff |
annotate
|
| Sun, 04 Mar 2018 14:53:57 -0500 |
Yuya Nishihara |
test-annotate: set stdin and stdout to binary to get CR unmodified
stable
|
file |
diff |
annotate
|
| Sun, 04 Mar 2018 13:19:05 -0500 |
Yuya Nishihara |
test-annotate: rewrite sed with some python
stable
|
file |
diff |
annotate
|
| Wed, 21 Feb 2018 21:14:05 +0900 |
Yuya Nishihara |
annotate: do not poorly split lines at CR (issue5798)
stable
|
file |
diff |
annotate
|
| Sat, 02 Dec 2017 19:33:34 -0500 |
Matt Harbison |
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages
|
file |
diff |
annotate
|
| Thu, 05 Oct 2017 15:12:11 -0400 |
Augie Fackler |
test-annotate: fix up expected output for pure
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 18:18:57 +0100 |
Siddharth Agarwal |
annotate: mark lines affected by skip-annotate with *
|
file |
diff |
annotate
|
| Tue, 22 Aug 2017 14:58:10 -0400 |
Augie Fackler |
tests: update test-annotate to pass our module import checker
|
file |
diff |
annotate
|
| Sat, 08 Jul 2017 13:07:59 +0900 |
Yuya Nishihara |
revset: add experimental relation and subscript operators
|
file |
diff |
annotate
|
| Sat, 08 Jul 2017 18:38:44 -0400 |
Matt Harbison |
test-annotate: conditionalize output instead of tests
|
file |
diff |
annotate
|
| Wed, 05 Jul 2017 13:54:53 +0200 |
Denis Laxalde |
followlines: join merge parents line ranges in blockdescendants() (issue5595)
|
file |
diff |
annotate
|
| Sat, 10 Jun 2017 10:46:06 -0400 |
Augie Fackler |
tests: handle variation between pure and normal output in annotate --skip
|
file |
diff |
annotate
|
| Sat, 03 Jun 2017 00:25:24 +0900 |
Yuya Nishihara |
annotate: restructure formatter output to be nested list (BC)
|
file |
diff |
annotate
|
| Wed, 24 May 2017 19:39:33 -0700 |
Siddharth Agarwal |
annotate: add a new experimental --skip option to skip revs
|
file |
diff |
annotate
|
| Mon, 01 May 2017 05:52:36 +0900 |
FUJIWARA Katsunori |
revset: add i18n comments to error messages for followlines predicate
stable
|
file |
diff |
annotate
|
| Thu, 20 Apr 2017 21:40:28 +0200 |
Denis Laxalde |
context: start walking from "introrev" in blockancestors()
stable
|
file |
diff |
annotate
|
| Sat, 15 Apr 2017 11:29:42 +0200 |
Denis Laxalde |
revset: properly parse "descend" argument of followlines()
|
file |
diff |
annotate
|
| Fri, 14 Apr 2017 14:25:06 +0200 |
Denis Laxalde |
context: possibly yield initial fctx in blockdescendants()
|
file |
diff |
annotate
|
| Fri, 14 Apr 2017 14:09:26 +0200 |
Denis Laxalde |
context: add an assertion checking linerange consistency in blockdescendants()
|
file |
diff |
annotate
|
| Fri, 14 Apr 2017 08:55:18 +0200 |
Denis Laxalde |
context: follow all branches in blockdescendants()
|
file |
diff |
annotate
|
| Mon, 16 Jan 2017 09:24:47 +0100 |
Denis Laxalde |
revset: add a 'descend' argument to followlines to return descendants
|
file |
diff |
annotate
|
| Mon, 09 Jan 2017 17:58:19 +0900 |
Yuya Nishihara |
revset: abuse x:y syntax to specify line range of followlines()
|
file |
diff |
annotate
|
| Mon, 09 Jan 2017 16:16:26 +0900 |
Yuya Nishihara |
revset: rename rev argument of followlines() to startrev
|
file |
diff |
annotate
|
| Mon, 09 Jan 2017 16:02:56 +0900 |
Yuya Nishihara |
revset: parse variable-length arguments of followlines() by getargsdict()
|
file |
diff |
annotate
|
| Wed, 04 Jan 2017 16:47:49 +0100 |
Denis Laxalde |
revset: add a followlines(file, fromline, toline[, rev]) revset
|
file |
diff |
annotate
|
| Tue, 15 Nov 2016 21:56:49 +0100 |
Mads Kiilerich |
bdiff: give slight preference to appending lines
|
file |
diff |
annotate
|
| Tue, 08 Nov 2016 18:37:33 +0100 |
Mads Kiilerich |
bdiff: give slight preference to longest matches in the middle of the B side
|
file |
diff |
annotate
|
| Fri, 02 Sep 2016 15:20:59 +0100 |
Jun Wu |
annotate: pre-calculate the "needed" dictionary (issue5360)
stable
|
file |
diff |
annotate
|