Mon, 18 May 2020 14:59:59 -0400 |
Augie Fackler |
mergestate: split out merge state handling code from main merge module
|
file |
diff |
annotate
|
Thu, 02 Apr 2020 21:58:10 +0530 |
Pulkit Goyal |
merge with stable
|
file |
diff |
annotate
|
Wed, 01 Apr 2020 14:14:55 -0700 |
Kyle Lippincott |
histedit: add missing b prefix to a string
stable 5.3.2
|
file |
diff |
annotate
|
Tue, 24 Mar 2020 23:31:36 -0700 |
Martin von Zweigbergk |
py3: use integer division in histedit
|
file |
diff |
annotate
|
Tue, 17 Mar 2020 12:59:31 -0700 |
Kyle Lippincott |
chistedit: support histedit.summary-template in curses histedit plan
|
file |
diff |
annotate
|
Fri, 06 Mar 2020 13:27:41 -0500 |
Augie Fackler |
cleanup: run pyupgrade on our source tree to clean up varying things
|
file |
diff |
annotate
|
Thu, 05 Mar 2020 10:46:31 -0800 |
Martin von Zweigbergk |
merge with stable
|
file |
diff |
annotate
|
Thu, 05 Mar 2020 10:52:51 -0500 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|
Thu, 05 Mar 2020 08:30:11 -0800 |
Martin von Zweigbergk |
histedit: fix formatting after D8150
stable
|
file |
diff |
annotate
|
Tue, 25 Feb 2020 13:23:37 -0800 |
Steve Fink |
histedit: py3 fixes for curses mode
stable
|
file |
diff |
annotate
|
Wed, 15 Jan 2020 15:30:25 -0800 |
Martin von Zweigbergk |
merge: introduce a clean_update() for that use-case
|
file |
diff |
annotate
|
Tue, 28 Jan 2020 14:53:23 -0800 |
Martin von Zweigbergk |
graft: default `base` argument to common case of `ctx.p1()`
|
file |
diff |
annotate
|
Fri, 27 Dec 2019 18:21:41 -0500 |
Matt Harbison |
histedit: avoid using a list comprehension to fill a list with fixed values
|
file |
diff |
annotate
|
Tue, 17 Dec 2019 10:53:51 -0800 |
Martin von Zweigbergk |
histedit: use rewriteutil.precheck() instead of reimplementing it
|
file |
diff |
annotate
|
Thu, 05 Dec 2019 11:15:19 -0500 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|
Sat, 30 Nov 2019 03:01:44 -0500 |
Matt Harbison |
histedit: fix an `isinstance(nodelist, str)` check for py3
stable
|
file |
diff |
annotate
|
Wed, 30 Oct 2019 19:19:57 -0400 |
Jordi Gutiérrez Hermoso |
histedit: render a rolled up description using the proper roll colours
|
file |
diff |
annotate
|
Wed, 30 Oct 2019 19:34:57 -0400 |
Jordi Gutiérrez Hermoso |
histedit: define new colour pairs for roll action
|
file |
diff |
annotate
|
Wed, 30 Oct 2019 19:27:09 -0400 |
Jordi Gutiérrez Hermoso |
histeditrule: split __bytes__ property into prefix and desc
|
file |
diff |
annotate
|
Sat, 09 Nov 2019 13:23:54 +0100 |
Pierre-Yves David |
index: use `index.get_rev` in `histedit.processreplacement`
|
file |
diff |
annotate
|
Sat, 09 Nov 2019 13:23:54 +0100 |
Pierre-Yves David |
index: use `index.get_rev` in `histedit.adjustreplacementsfrommarkers`
|
file |
diff |
annotate
|
Fri, 08 Nov 2019 15:09:09 +0100 |
Pierre-Yves David |
index: use `index.has_node` in `histedit.cleanupnode`
|
file |
diff |
annotate
|
Fri, 08 Nov 2019 15:08:27 +0100 |
Pierre-Yves David |
index: use `index.has_node` in `histedit._finishhistedit
|
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
|
Fri, 01 Nov 2019 21:46:34 -0700 |
Martin von Zweigbergk |
histedit: restore hex nodeids to be 12 digits long
stable
|
file |
diff |
annotate
|
Thu, 31 Oct 2019 15:03:12 -0700 |
Martin von Zweigbergk |
py3: use native strings as keys into **opts in chistedit
stable
|
file |
diff |
annotate
|
Thu, 31 Oct 2019 15:00:49 -0700 |
Martin von Zweigbergk |
py3: open chistedit file in binary mode using vfs
stable
|
file |
diff |
annotate
|
Thu, 31 Oct 2019 15:02:48 -0700 |
Martin von Zweigbergk |
py3: avoid another b''.format() in chistedit
stable
|
file |
diff |
annotate
|
Thu, 31 Oct 2019 15:02:03 -0700 |
Martin von Zweigbergk |
py3: render message about conflicts in chistedit code
stable
|
file |
diff |
annotate
|
Thu, 31 Oct 2019 14:46:17 -0700 |
Martin von Zweigbergk |
py3: handle keypresses in chistedit
stable
|
file |
diff |
annotate
|
Thu, 31 Oct 2019 14:25:51 -0700 |
Martin von Zweigbergk |
py3: make chistedit render
stable
|
file |
diff |
annotate
|
Tue, 15 Oct 2019 12:14:44 +0200 |
Denis Laxalde |
py3: prevent comparison with None in curses histedit (issue6196)
|
file |
diff |
annotate
|
Tue, 08 Oct 2019 15:06:18 -0700 |
Martin von Zweigbergk |
cleanup: join string literals that are already on one line
|
file |
diff |
annotate
|
Sun, 06 Oct 2019 19:25:18 -0400 |
Gregory Szorc |
py3: define and use pycompat.iteritems() for hgext/
|
file |
diff |
annotate
|
Sun, 06 Oct 2019 16:55:18 -0400 |
Gregory Szorc |
py3: manually import getattr where it is needed
|
file |
diff |
annotate
|
Sun, 06 Oct 2019 13:28:56 -0400 |
Gregory Szorc |
py3: manually import pycompat.open into files that need it
|
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
|
Wed, 25 Sep 2019 14:35:08 -0700 |
Martin von Zweigbergk |
update: clarify calculateupdate() call sites by specifying argument names
|
file |
diff |
annotate
|
Wed, 25 Sep 2019 13:50:48 -0400 |
Augie Fackler |
histedit: sniff-test for untracked file conflicts before prompting for rules
|
file |
diff |
annotate
|
Thu, 25 Jul 2019 21:28:29 +0900 |
Yuya Nishihara |
curses: do not setlocale() at import time (issue5261)
stable
|
file |
diff |
annotate
|
Fri, 28 Jun 2019 00:35:52 +0530 |
Taapas Agrawal |
abort: added support for histedit
|
file |
diff |
annotate
|
Thu, 20 Jun 2019 11:40:08 +0530 |
Taapas Agrawal |
statecheck: added support for cmdutil.afterresolvedstates
|
file |
diff |
annotate
|
Sun, 09 Jun 2019 00:43:36 +0530 |
Taapas Agrawal |
state: created new class statecheck to handle unfinishedstates
|
file |
diff |
annotate
|
Sat, 08 Jun 2019 23:43:53 +0530 |
Taapas Agrawal |
states: moved cmdutil.unfinishedstates to state.py
|
file |
diff |
annotate
|
Thu, 25 Apr 2019 15:30:40 -0700 |
feyu |
histedit: Speed up scrolling in patch view mode
|
file |
diff |
annotate
|
Thu, 02 May 2019 16:43:34 -0700 |
Yu Feng |
histedit: Show file names in multiple line format
|
file |
diff |
annotate
|
Tue, 16 Apr 2019 13:12:21 -0400 |
Jordi Gutiérrez Hermoso |
chistedit: use context manager to set verbose ui
|
file |
diff |
annotate
|
Wed, 03 Apr 2019 23:55:03 -0400 |
Jordi Gutiérrez Hermoso |
chistedit: add basic colours to diff view
|
file |
diff |
annotate
|
Fri, 05 Apr 2019 14:54:45 -0400 |
Jordi Gutiérrez Hermoso |
chistedit: use default curses colours
|
file |
diff |
annotate
|
Thu, 04 Apr 2019 10:41:55 -0400 |
Jordi Gutiérrez Hermoso |
chistedit: properly show verbose diffs
|
file |
diff |
annotate
|
Mon, 01 Apr 2019 19:02:24 -0700 |
Rodrigo Damazio Bovendorp |
histedit: narrow the scope of discarded ui output
|
file |
diff |
annotate
|
Tue, 26 Mar 2019 11:53:30 -0400 |
Jordi Gutiérrez Hermoso |
chistedit: change in-progress message
|
file |
diff |
annotate
|
Tue, 19 Mar 2019 22:58:39 -0700 |
Martin von Zweigbergk |
memctx: rename constructor argument "copied" to "copysource" (API)
|
file |
diff |
annotate
|
Sat, 02 Mar 2019 13:15:53 -0800 |
Gregory Szorc |
global: use raw string for setlocale() argument
|
file |
diff |
annotate
|
Wed, 20 Feb 2019 19:28:51 -0500 |
Augie Fackler |
cleanup: use () to wrap long lines instead of \
|
file |
diff |
annotate
|
Fri, 15 Feb 2019 14:56:07 -0500 |
Jordi Gutiérrez Hermoso |
chistedit: ensure a locale is set
|
file |
diff |
annotate
|
Wed, 13 Feb 2019 16:58:24 -0500 |
Jordi Gutiérrez Hermoso |
chistedit: use magenta for current line as in crecord (issue6071)
|
file |
diff |
annotate
|
Thu, 14 Feb 2019 20:57:26 +0530 |
Akshit Jain |
chistedit: improve proper username in histedit curses interface
|
file |
diff |
annotate
|
Wed, 13 Feb 2019 16:02:44 -0500 |
Jordi Gutiérrez Hermoso |
histedit: remove "chistedit" mention from interface
|
file |
diff |
annotate
|