Patchwork Mercurial

login
register
mail settings

Incoming patches

« Previous 1 2 ... 86 87 88 89 90 91 92 93 94 ... 100 101 Next »
Filters: none add filter
Patch Date Submitter Delegate State
[38,of,41] basefilectx: move ancestor from filectx 2013-08-12 Sean Farley Accepted
[37,of,41] basefilectx: move annotate from filectx 2013-08-12 Sean Farley Accepted
[36,of,41] basefilectx: move p2 from filectx 2013-08-12 Sean Farley Accepted
[35,of,41] basefilectx: move p1 from filectx 2013-08-12 Sean Farley Accepted
[34,of,41] basefilectx: move parents from filectx 2013-08-12 Sean Farley Accepted
[33,of,41] basefilectx: move cmp from filectx 2013-08-12 Sean Farley Accepted
[32,of,41] basefilectx: move isbinary from filectx 2013-08-12 Sean Farley Accepted
[31,of,41] basefilectx: move path from filectx 2013-08-12 Sean Farley Accepted
[30,of,41] basefilectx: move changectx from filectx 2013-08-12 Sean Farley Accepted
[29,of,41] basefilectx: move manifest from filectx 2013-08-12 Sean Farley Accepted
[28,of,41] basefilectx: move phasestr from filectx 2013-08-12 Sean Farley Accepted
[27,of,41] basefilectx: move phase from filectx 2013-08-12 Sean Farley Accepted
[26,of,41] basefilectx: move extra from filectx 2013-08-12 Sean Farley Accepted
[25,of,41] basefilectx: move branch from filectx 2013-08-12 Sean Farley Accepted
[24,of,41] basefilectx: move description from filectx 2013-08-12 Sean Farley Accepted
[23,of,41] basefilectx: move files from filectx 2013-08-12 Sean Farley Accepted
[22,of,41] basefilectx: move date from filectx 2013-08-12 Sean Farley Accepted
[21,of,41] basefilectx: move user from filectx 2013-08-12 Sean Farley Accepted
[20,of,41] basefilectx: move hex from filectx 2013-08-12 Sean Farley Accepted
[19,of,41] basefilectx: move node from filectx 2013-08-12 Sean Farley Accepted
[18,of,41] basefilectx: move linkrev from filectx 2013-08-12 Sean Farley Accepted
[17,of,41] basefilectx: move rev from filectx 2013-08-12 Sean Farley Accepted
[16,of,41] basefilectx: move filelog from filectx 2013-08-12 Sean Farley Accepted
[15,of,41] basefilectx: move flags from filectx 2013-08-12 Sean Farley Accepted
[14,of,41] basefilectx: move filenode from filectx 2013-08-12 Sean Farley Accepted
[13,of,41] basefilectx: move filerev from filectx 2013-08-12 Sean Farley Accepted
[12,of,41] basefilectx: move __ne__ from filectx 2013-08-12 Sean Farley Accepted
[11,of,41] basefilectx: move __eq__ from filectx 2013-08-12 Sean Farley Accepted
[10,of,41] basefilectx: move __hash__ from filectx 2013-08-12 Sean Farley Accepted
[09,of,41] basefilectx: move __repr__ from filectx 2013-08-12 Sean Farley Accepted
[08,of,41] basefilectx: move __str__ from filectx 2013-08-12 Sean Farley Accepted
[07,of,41] basefilectx: move __nonzero__ from filectx 2013-08-12 Sean Farley Accepted
[06,of,41] basefilectx: move _repopath from filectx 2013-08-12 Sean Farley Accepted
[05,of,41] basefilectx: move _filerev from filectx 2013-08-12 Sean Farley Accepted
[04,of,41] basefilectx: move _filenode from filectx 2013-08-12 Sean Farley Accepted
[03,of,41] basefilectx: move _changeid from filectx 2013-08-12 Sean Farley Accepted
[02,of,41] basefilectx: move _filelog from filectx 2013-08-12 Sean Farley Accepted
[01,of,41] basefilectx: add an empty class that will be used as a parent of file contexts 2013-08-12 Sean Farley Accepted
[35,of,35,V2] workingctx: inherit from context instead of changectx 2013-08-07 Sean Farley Accepted
[34,of,35,V2] largefiles: remove unnecessary check of instance 2013-08-07 Sean Farley Accepted
[33,of,35,V2] localrepo: remove unnecessary check of instance 2013-08-07 Sean Farley Accepted
[32,of,35,V2] context: remove unnecessary check of instance 2013-08-07 Sean Farley Accepted
[31,of,35,V2] context: move dirty from changectx 2013-08-07 Sean Farley Accepted
[30,of,35,V2] context: move dirs from changectx 2013-08-07 Sean Farley Accepted
[29,of,35,V2] context: move _dirs from changectx 2013-08-07 Sean Farley Accepted
[28,of,35,V2] context: move diff from changectx 2013-08-07 Sean Farley Accepted
[27,of,35,V2] context: move match from changectx 2013-08-07 Sean Farley Accepted
[26,of,35,V2] context: move sub from changectx 2013-08-07 Sean Farley Accepted
[25,of,35,V2] context: move flags from changectx 2013-08-07 Sean Farley Accepted
[24,of,35,V2] context: move filenode from changectx 2013-08-07 Sean Farley Accepted
[23,of,35,V2] context: move _fileinfo from changectx 2013-08-07 Sean Farley Accepted
[22,of,35,V2] context: move p2 from changectx 2013-08-07 Sean Farley Accepted
[21,of,35,V2] context: move p1 from changectx 2013-08-07 Sean Farley Accepted
[20,of,35,V2] context: move parents from changectx 2013-08-07 Sean Farley Accepted
[19,of,35,V2] context: move mutable from changectx 2013-08-07 Sean Farley Accepted
[18,of,35,V2] context: move phasestr from changectx 2013-08-07 Sean Farley Accepted
[17,of,35,V2] context: move manifest from changectx 2013-08-07 Sean Farley Accepted
[16,of,35,V2] context: move __iter__ from changectx 2013-08-07 Sean Farley Accepted
[15,of,35,V2] context: move __getitem__ from changectx 2013-08-07 Sean Farley Accepted
[14,of,35,V2] context: move __contains__ from changectx 2013-08-07 Sean Farley Accepted
[13,of,35,V2] context: move substate from changectx 2013-08-07 Sean Farley Accepted
[12,of,35,V2] context: move __ne__ from changectx 2013-08-07 Sean Farley Accepted
[11,of,35,V2] context: move __eq__ from changectx 2013-08-07 Sean Farley Accepted
[10,of,35,V2] context: move __repr__ from changectx 2013-08-07 Sean Farley Accepted
[09,of,35,V2] context: move __int__ from changectx 2013-08-07 Sean Farley Accepted
[08,of,35,V2] context: change _node to node() in hex 2013-08-07 Sean Farley Accepted
[07,of,35,V2] context: move hex from changectx 2013-08-07 Sean Farley Accepted
[06,of,35,V2] context: move node from changectx 2013-08-07 Sean Farley Accepted
[05,of,35,V2] context: move rev from changectx 2013-08-07 Sean Farley Accepted
[04,of,35,V2] context: move __str__ from changectx 2013-08-07 Sean Farley Accepted
[03,of,35,V2] changectx: if passing a context then exit __init__ immediately 2013-08-07 Sean Farley Accepted
[02,of,35,V2] context: return a copied context if changeid is already a context 2013-08-07 Sean Farley Accepted
[01,of,35,V2] context: add an empty class that will be used as a parent of all contexts 2013-08-07 Sean Farley Accepted
[36,of,36] changectx: if passing a context then exit __init__ immediately 2013-08-07 Sean Farley durin42 Superseded
[35,of,36] workingctx: inherit from context instead of changectx 2013-08-07 Sean Farley durin42 Superseded
[34,of,36] largefiles: remove unnecessary check of instance 2013-08-07 Sean Farley durin42 Superseded
[33,of,36] localrepo: remove unnecessary check of instance 2013-08-07 Sean Farley durin42 Superseded
[32,of,36] context: remove unnecessary check of instance 2013-08-07 Sean Farley durin42 Superseded
[31,of,36] context: move dirty from changectx 2013-08-07 Sean Farley durin42 Superseded
[30,of,36] context: move dirs from changectx 2013-08-07 Sean Farley durin42 Superseded
[29,of,36] context: move _dirs from changectx 2013-08-07 Sean Farley durin42 Superseded
[28,of,36] context: move diff from changectx 2013-08-07 Sean Farley durin42 Superseded
[27,of,36] context: move match from changectx 2013-08-07 Sean Farley durin42 Superseded
[26,of,36] context: move sub from changectx 2013-08-07 Sean Farley durin42 Superseded
[25,of,36] context: move flags from changectx 2013-08-07 Sean Farley durin42 Superseded
[24,of,36] context: move filenode from changectx 2013-08-07 Sean Farley durin42 Superseded
[23,of,36] context: move _fileinfo from changectx 2013-08-07 Sean Farley durin42 Superseded
[22,of,36] context: move p2 from changectx 2013-08-07 Sean Farley durin42 Superseded
[21,of,36] context: move p1 from changectx 2013-08-07 Sean Farley durin42 Superseded
[20,of,36] context: move parents from changectx 2013-08-07 Sean Farley durin42 Superseded
[19,of,36] context: move mutable from changectx 2013-08-07 Sean Farley durin42 Superseded
[18,of,36] context: move phasestr from changectx 2013-08-07 Sean Farley durin42 Superseded
[17,of,36] context: move manifest from changectx 2013-08-07 Sean Farley durin42 Superseded
[16,of,36] context: move __iter__ from changectx 2013-08-07 Sean Farley durin42 Superseded
[15,of,36] context: move __getitem__ from changectx 2013-08-07 Sean Farley durin42 Superseded
[14,of,36] context: move __contains__ from changectx 2013-08-07 Sean Farley durin42 Superseded
[13,of,36] context: move substate from changectx 2013-08-07 Sean Farley durin42 Superseded
[12,of,36] context: move __ne__ from changectx 2013-08-07 Sean Farley durin42 Superseded
[11,of,36] context: move __eq__ from changectx 2013-08-07 Sean Farley durin42 Superseded
[10,of,36] context: use type(self).__name__ to instead of hardcoding class name 2013-08-07 Sean Farley durin42 Changes Requested
[09,of,36] context: move __repr__ from changectx 2013-08-07 Sean Farley durin42 Superseded
[08,of,36] context: move __int__ from changectx 2013-08-07 Sean Farley durin42 Superseded
[07,of,36] context: change _node to node() in hex 2013-08-07 Sean Farley durin42 Superseded
[06,of,36] context: move hex from changectx 2013-08-07 Sean Farley durin42 Superseded
[05,of,36] context: move node from changectx 2013-08-07 Sean Farley durin42 Superseded
[04,of,36] context: move rev from changectx 2013-08-07 Sean Farley durin42 Superseded
[03,of,36] context: move __str__ from changectx 2013-08-07 Sean Farley durin42 Superseded
[02,of,36] context: return a copied context if changeid is already a context 2013-08-07 Sean Farley durin42 Superseded
[01,of,36] context: add an empty class that will be used as a parent of all contexts 2013-08-07 Sean Farley durin42 Superseded
[2,of,2] dispatch: add ability to specify a custom pdb module as a debugger 2013-08-07 Sean Farley Superseded
[1,of,2] dispatch: move command line --config argument parsing to _runcatch() 2013-08-07 Sean Farley Superseded
[2,of,2] dispatch: add ability to specify a custom pdb module as a debugger 2013-07-13 Sean Farley Superseded
[1,of,2] dispatch: move command line --config argument parsing to _runcatch() 2013-07-13 Sean Farley Superseded
[14,of,14,RFC] memfilectx: inherit from workingfilectx 2013-07-09 Sean Farley Changes Requested
[13,of,14,RFC] memfilectx: add _filerev method 2013-07-09 Sean Farley Changes Requested
[12,of,14,RFC] memfilectx: change init to take a repo object 2013-07-09 Sean Farley Changes Requested
[11,of,14,RFC] memfilectx: add cmp method 2013-07-09 Sean Farley Changes Requested
[10,of,14,RFC] memfilectx: add a size method 2013-07-09 Sean Farley Accepted
[09,of,14,RFC] memfilectx: add __repr__ method 2013-07-09 Sean Farley Changes Requested
[08,of,14,RFC] memctx: inherit from workingctx 2013-07-09 Sean Farley Changes Requested
[07,of,14,RFC] memctx: add __repr__ method 2013-07-09 Sean Farley Changes Requested
[06,of,14,RFC] context: explicitly unpack variable in workingctx._manifest 2013-07-09 Sean Farley Changes Requested
[05,of,14,RFC] patch: simple wrapping of diff to take two contexts 2013-07-09 Sean Farley Changes Requested
[04,of,14,RFC] localrepo: use context.nodeorctx to reduce code 2013-07-09 Sean Farley Changes Requested
[03,of,14,RFC] changctx: use new nodeorctx method in diff 2013-07-09 Sean Farley Changes Requested
[02,of,14,RFC] context: add a method to convert node to ctx 2013-07-09 Sean Farley Changes Requested
[01,of,14,RFC] dispatch: add ability to specify ipdb as a debugger 2013-07-09 Sean Farley Superseded
[2,of,2] templater: add indentation arguments to the fill function 2013-05-20 Sean Farley Accepted
[1,of,2] templater: move templatefilters.func into the same place as the other funcs 2013-05-20 Sean Farley Accepted
[STABLE] templater: catch parsing error for sub 2013-05-13 Sean Farley Changes Requested
[5,of,5,STABLE,V2] bookmarks: move active bookmark forward upon rebase (issue3813) (BC) 2013-05-01 Sean Farley krbullock Rejected
[4,of,5,STABLE,V2] bookmarks: fix bug that activated a bookmark even with -r passed 2013-05-01 Sean Farley Accepted
[3,of,5,STABLE,V2] bookmarks: resolve divergent bookmark when moving across a branch 2013-05-01 Sean Farley Accepted
[2,of,5,STABLE,V2] bookmarks: resolve divergent bookmarks when moving active bookmark forward 2013-05-01 Sean Farley Accepted
[1,of,5,STABLE,V2] bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant 2013-05-01 Sean Farley Accepted
[2,of,2,STABLE] bookmarks: resolve divergent bookmarks when moving active bookmark forward 2013-04-29 Sean Farley Superseded
[1,of,2,STABLE] bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant 2013-04-29 Sean Farley Superseded
[3,of,3] templater: add indentation arguments to the fill function 2013-04-18 Sean Farley Superseded
[2,of,3] templater: move templatefilters.func into the same place as the other funcs 2013-04-18 Sean Farley Superseded
[1,of,3] template: call runtemplate on the src argument to sub 2013-04-18 Sean Farley Accepted
convert: replace old sha1s in the description 2013-03-27 Sean Farley Superseded
bookmarks: resolve divergent bookmark when moving forward 2013-03-27 Sean Farley Superseded
diff: fix binary file removals in git mode 2013-03-22 Sean Farley Accepted
patch: match 'diff --git a/' instead of 'diff --git' 2013-03-22 Sean Farley Accepted
[0,of,9] hgk: further improvements 2013-03-22 Sean Farley Not Applicable
[3,of,3] graphmod: don't try to visit nullrev (issue3772) 2013-01-23 Sean Farley Superseded
[2,of,3] log: remove any ancestors of nullrev (issue3772) 2013-01-23 Sean Farley Accepted
[1,of,3] help: add documentation for new template functions 2013-01-23 Sean Farley Accepted
[stable] graphmod: don't try to visit nullrev (issue3772) 2013-01-22 Sean Farley Superseded
help: add documentation for new template functions 2013-01-22 Sean Farley Superseded
graphlog: remove rev from parents (issue3772) 2013-01-22 Sean Farley Changes Requested
[2,of,2] templaterfilters: add 'newline' filter 2013-01-09 Sean Farley Rejected
[1,of,2] templaterfilters: add new 'notfirstline' filter 2013-01-09 Sean Farley Rejected
[2,of,2] color: add template label function 2012-12-29 Sean Farley bos Accepted
[1,of,2] templater: add no-op template function 'label' 2012-12-29 Sean Farley bos Accepted
[6,of,6,RFC] color: add special case handling for default template labels 2012-12-24 Sean Farley Superseded
[5,of,6,RFC] color: extract symbol from template label args 2012-12-24 Sean Farley Superseded
[4,of,6,RFC] color: add an array of default labels 2012-12-24 Sean Farley Superseded
[3,of,6,RFC] color: add template label function 2012-12-24 Sean Farley Superseded
[2,of,6,RFC] templater: wrap each parsed element with a label filter 2012-12-24 Sean Farley Superseded
[1,of,6,RFC] templater: add no-op template function 'label' 2012-12-24 Sean Farley Superseded
[10,of,10,RFC] templatekw: complicated logic to add labels to {files} 2012-12-21 Sean Farley Superseded
[09,of,10,RFC] templatekw: add labels to getfiles 2012-12-21 Sean Farley Superseded
[08,of,10,RFC] templatekw: add labelify to _showlist to mimic ''.join() 2012-12-21 Sean Farley Superseded
[07,of,10,RFC] templatekw: simple example of labelify for {user} 2012-12-21 Sean Farley Superseded
[06,of,10,RFC] templater: teach _flatten about labels 2012-12-21 Sean Farley Superseded
[05,of,10,RFC] templater: add local versions of labelify and delabelify 2012-12-21 Sean Farley Superseded
[04,of,10,RFC] templatefilter: make stringify remove label wrappers 2012-12-21 Sean Farley Superseded
[03,of,10,RFC] templatefilter: add labelify and delabelify functions 2012-12-21 Sean Farley Superseded
[02,of,10,RFC] templater: ensure callers that expect a string will always get a string 2012-12-21 Sean Farley Superseded
[01,of,10,RFC] command: set minchunk to zero to disable chunking on the command line 2012-12-21 Sean Farley Superseded
revert: don't backup if no files reverted in interactive mode (issue4793) 2016-07-01 Sean Karlage Accepted
test-parse-date: defines explicit start/end dates for DST 2016-03-10 Sébastien Brissaud Accepted
test-patchbomb: ensure hg email write to stdout 2016-02-07 Sébastien Brissaud yuya Accepted
test-parse-date: fix timezone name used to test local time with DST 2016-02-07 Sébastien Brissaud yuya Changes Requested
test-parse-date: fix timezone name used to test local time with DST 2016-02-07 Sébastien Brissaud Superseded
[V2] fancyopts: allow all callable as default parameter value 2015-06-11 shiyao.ma Accepted
fancyopts: allow all callable as default parameter value 2015-06-11 shiyao.ma Superseded
[3,of,3,evolve-ext,v2] prune: changing bookmark argument to be a list 2015-12-11 Shubhanshu Agrawal Accepted
[2,of,3,evolve-ext,v2] prune: remove a list of bookmarks 2015-12-11 Shubhanshu Agrawal Accepted
[1,of,3,evolve-ext,v2] prune: renaming local variables 2015-12-11 Shubhanshu Agrawal Accepted
[3,of,3,evolve-ext] evolve: changing bookmark argument to be a list 2015-12-11 Shubhanshu Agrawal Changes Requested
[2,of,3,evolve-ext] evolve: prune a list of bookmarks 2015-12-11 Shubhanshu Agrawal Changes Requested
[1,of,3,evolve-ext] evolve: renaming local variables 2015-12-11 Shubhanshu Agrawal Accepted
[2,of,2,V5] strip: changing bookmark argument to be a list 2015-11-19 Shubhanshu Agrawal Accepted
[1,of,2,V5] strip: strip a list of bookmarks 2015-11-19 Shubhanshu Agrawal Accepted
[1,of,2,V5] strip: strip a list of bookmarks 2015-11-19 Shubhanshu Agrawal Superseded
[1,of,2,V5] strip: strip a list of bookmarks 2015-11-19 Shubhanshu Agrawal Superseded
[3,of,3] strip: changing bookmark argument to be a list 2015-11-18 Shubhanshu Agrawal Superseded
[2,of,3] strip: strip a list of bookmarks 2015-11-18 Shubhanshu Agrawal Superseded
[1,of,3] strip: renaming local variables 2015-11-18 Shubhanshu Agrawal Accepted
[3,of,3,v4] strip: changing bookmark argument to be a list 2015-11-16 Shubhanshu Agrawal marmoute Superseded
[2,of,3,v4] strip: strip a list of bookmarks 2015-11-16 Shubhanshu Agrawal marmoute Superseded
[1,of,3,v4] strip: renaming local variables 2015-11-16 Shubhanshu Agrawal Superseded
[3,of,3] strip: changing bookmark argument to be a list 2015-11-16 Shubhanshu Agrawal Superseded
[2,of,3] strip: strip a list of bookmarks 2015-11-16 Shubhanshu Agrawal Superseded
[1,of,3] strip: renaming local variables 2015-11-16 Shubhanshu Agrawal Superseded
[3,of,3] strip: changing bookmark argument to be a list 2015-11-15 Shubhanshu Agrawal Superseded
[2,of,3] strip: strip a list of bookmarks 2015-11-15 Shubhanshu Agrawal Superseded
[1,of,3] strip: renaming local variables 2015-11-15 Shubhanshu Agrawal Superseded
consider WindowsError's behaviour to support python 2.4 on Windows 2013-07-12 Shun-ichi Goto Accepted
win32mbcs: wrap util.split() 2013-07-05 Shun-ichi Goto Accepted
[evolve-ext-V6] code hygiene 2016-02-03 Shusen LIU Changes Requested
[2,of,2,evolve-ext-V5] afterresolvehook for evolve --continue 2016-01-27 Shusen LIU marmoute Deferred
[1,of,2,evolve-ext-V5] evolve: add new method _evolvecontinue (issue4854) 2016-01-27 Shusen LIU marmoute Deferred
[evolve-ext-V5] evolve: add new methods _evolvestatewrite, _evolvestateread, _evolvestatedelete 2016-01-26 Shusen LIU marmoute Changes Requested
[evolve-ext-V5] evolve: extract logic to new method _evolvemerge 2016-01-26 Shusen LIU marmoute Accepted
[evolve-ext-V4] evolve: add new method _evolvecontinue (issue4854) 2016-01-20 Shusen LIU marmoute Changes Requested
[evolve-ext-V4] evolve: add new methods _evolvestatewrite, _evolvestateread, _evolvestatedelete 2016-01-20 Shusen LIU marmoute Changes Requested
[evolve-ext-V4] evolve: extract logic to new method _evolvemerge 2016-01-19 Shusen LIU marmoute Changes Requested
[evolve-ext-V4] evolve: add new methods _evolvestatewrite, _evolvestateread, _evolvestatedelete 2015-12-20 Shusen LIU marmoute Changes Requested
[evolve-ext] evolve: extract logic to new method _evolvemerge 2015-12-20 Shusen LIU marmoute Superseded
[4,of,4,evolve-ext-V3] evolve: extract logic to new method _evolvemerge 2015-12-18 Shusen LIU marmoute Superseded
[3,of,4,evolve-ext-V3] evolve: add new method _evolvestatedelete 2015-12-18 Shusen LIU marmoute Superseded
[2,of,4,evolve-ext-V3] evolve: add new method _evolvestateread 2015-12-18 Shusen LIU marmoute Superseded
[1,of,4,evolve-ext-V3] evolve: add new method _evolvestatewrite 2015-12-18 Shusen LIU marmoute Superseded
[4,of,4,evolve-ext] evolve: extract logic to new method _evolvemerge 2015-12-18 Shusen LIU Superseded
[3,of,4,evolve-ext] evolve: add new method _evolvestatedelete 2015-12-18 Shusen LIU Superseded
[2,of,4,evolve-ext] evolve: add new method _evolvestateread 2015-12-18 Shusen LIU Superseded
[1,of,4,evolve-ext] evolve: add new method _evolvestatewrite 2015-12-18 Shusen LIU Superseded
[4,of,4,evolve-ext-V2] evolve: extract logic to new method _evolvemerge 2015-12-16 Shusen LIU Changes Requested
[3,of,4,evolve-ext-V2] evolve: add new method _evolvestatedelete 2015-12-16 Shusen LIU Changes Requested
[2,of,4,evolve-ext-V2] evolve: add new method _evolvestateread 2015-12-16 Shusen LIU Changes Requested
[1,of,4,evolve-ext-V2] evolve: add new method _evolvestatewrite 2015-12-16 Shusen LIU Changes Requested
[2,of,2,evolve-ext] evolve: extract logic to new method _finalizerelocate 2015-12-15 Shusen LIU lcharignon Accepted
[1,of,2,evolve-ext] evolve: extract logic to new method _relocatecommit 2015-12-15 Shusen LIU lcharignon Accepted
[7,of,7,evolve-ext] _evolvecontinue 2015-12-07 Shusen LIU lcharignon Rejected
[6,of,7,evolve-ext] _evolvemerge 2015-12-07 Shusen LIU lcharignon Rejected
[5,of,7,evolve-ext] _evolvestatewrite 2015-12-07 Shusen LIU lcharignon Rejected
[4,of,7,evolve-ext] _evolvestateread 2015-12-07 Shusen LIU lcharignon Rejected
[3,of,7,evolve-ext] _evolvestatedelete 2015-12-07 Shusen LIU lcharignon Rejected
[2,of,7,evolve-ext] _finalizerelocate 2015-12-07 Shusen LIU lcharignon Rejected
[1,of,7,evolve-ext] _relocatecommit 2015-12-07 Shusen LIU lcharignon Rejected
[evolve-ext] evolve refactor 2015-12-02 Shusen LIU marmoute Changes Requested
sshserver: add a couple of tests for argument parsing 2018-01-19 Siddharth Agarwal Accepted
[2,of,2] bundle2: add debug info about the number of stream params 2017-06-27 Siddharth Agarwal Accepted
[1,of,2] bundle2: add some debugging information to the not-a-bundle error 2017-06-27 Siddharth Agarwal Accepted
[5,of,5] fsmonitor: don't write out state if identity has changed (issue5581) 2017-06-12 Siddharth Agarwal Accepted
[4,of,5] fsmonitor: write state with wlock held and dirstate unchanged (issue5581) 2017-06-12 Siddharth Agarwal Accepted
[3,of,5] workingctx: add a way for extensions to run code at status fixup time 2017-06-12 Siddharth Agarwal Accepted
[2,of,5] workingctx: also pass status tuple into poststatusfixup 2017-06-12 Siddharth Agarwal Accepted
[1,of,5] workingctx: factor out post-status dirstate fixup 2017-06-12 Siddharth Agarwal Accepted
test-dirstate-race: back out changeset c82fa7efcbc8 2017-06-12 Siddharth Agarwal Accepted
[4,of,4] filestat: move __init__ to frompath constructor 2017-06-10 Siddharth Agarwal Accepted
[3,of,4] test-dirstate-race: ensure that a isn't in the lookup set at the end 2017-06-10 Siddharth Agarwal Accepted
[2,of,4] hghave: add test for whether fsmonitor is enabled 2017-06-10 Siddharth Agarwal Accepted
[1,of,4] tests: add a wrapper to run fsmonitor tests 2017-06-10 Siddharth Agarwal Accepted
[5,of,5] run-tests: make --restart work with output dir 2017-06-08 Siddharth Agarwal Accepted
[4,of,5] run-tests: output coverage to output dir 2017-06-08 Siddharth Agarwal Accepted
[3,of,5] run-tests: write JSON reports to output dir 2017-06-08 Siddharth Agarwal Accepted
[2,of,5] run-tests: write test times to output dir 2017-06-08 Siddharth Agarwal Accepted
[1,of,5] run-tests: allow specifying an output dir to write .errs to 2017-06-08 Siddharth Agarwal Accepted
[2,of,2] run-tests: add information about skipped tests to XUnit output 2017-06-07 Siddharth Agarwal Accepted
[1,of,2] run-tests: wrap failures in an XUnit 'failure' element 2017-06-07 Siddharth Agarwal Accepted
[5,of,5] run-tests: add a way to list tests, with JSON and XUnit support 2017-06-06 Siddharth Agarwal Accepted
[4,of,5] run-tests: install hg after computing tests to run 2017-06-06 Siddharth Agarwal Accepted
[3,of,5] run-tests: make time field optional for xunit report 2017-06-06 Siddharth Agarwal Accepted
[2,of,5] run-tests: factor out json write code into another method 2017-06-06 Siddharth Agarwal Accepted
[1,of,5] run-tests: factor out xunit write code into another method 2017-06-06 Siddharth Agarwal Accepted
dirstate: add docstring for invalidate 2017-06-04 Siddharth Agarwal Accepted
[STABLE] status: don't crash if a lookup file disappears 2017-06-03 Siddharth Agarwal Accepted
match: introduce nevermatcher for when no ignore files are present 2017-06-01 Siddharth Agarwal Accepted
import-checker: add hgdemandimport to local modules 2017-06-01 Siddharth Agarwal Accepted
rebase: drop unnecessary parentchange call 2017-06-01 Siddharth Agarwal Accepted
[4,of,4,hyperblame] annotate: add a new experimental --skip option to skip revs 2017-05-25 Siddharth Agarwal Accepted
[3,of,4,hyperblame] annotate: add core algorithm to skip a rev 2017-05-25 Siddharth Agarwal Accepted
[2,of,4,hyperblame] annotate: make pair take all parents to pair against 2017-05-25 Siddharth Agarwal Accepted
[1,of,4,hyperblame] annotate: move pair function to top level 2017-05-25 Siddharth Agarwal Accepted
[hyperblame] annotate: allow skipping revs 2017-05-23 Siddharth Agarwal Superseded
[8,of,8,demandimport-py3] python3: allow hgloader to work with lazy loaders 2017-05-21 Siddharth Agarwal Accepted
[7,of,8,demandimport-py3] init: turn on demandimport for Python 3.6 and above 2017-05-21 Siddharth Agarwal Accepted
[6,of,8,demandimport-py3] demandimport: add python 3 implementation 2017-05-21 Siddharth Agarwal Accepted
[5,of,8,demandimport-py3] demandimport: move ignore list to __init__.py 2017-05-21 Siddharth Agarwal Accepted
[4,of,8,demandimport-py3] check: check modules in hgdemandimport 2017-05-21 Siddharth Agarwal Accepted
[3,of,8,demandimport-py3] demandimport: move to separate package 2017-05-21 Siddharth Agarwal Accepted
[2,of,8,demandimport-py3] import-checker: add a way to directly import certain symbols 2017-05-21 Siddharth Agarwal Accepted
[1,of,8,demandimport-py3] check-code: allow skipping hasattr check in py3-only code 2017-05-21 Siddharth Agarwal Accepted
[4,of,4,V2] clone: add a server-side option to disable full getbundles (pull-based clones) 2017-05-11 Siddharth Agarwal Accepted
[3,of,4,V2] clone: warn when streaming was requested but couldn't be performed 2017-05-11 Siddharth Agarwal Accepted
[2,of,4,V2] clone: test streaming disabled because client is missing requirement 2017-05-11 Siddharth Agarwal Accepted
[1,of,4,V2] bundle2: don't check for whether we can do stream clones 2017-05-11 Siddharth Agarwal Accepted
[4,of,4,RFC] clone: add a server-side option to disable full getbundles (pull-based clones) 2017-05-09 Siddharth Agarwal Superseded
[3,of,4,RFC] clone: warn when streaming was requested but couldn't be performed 2017-05-09 Siddharth Agarwal Superseded
[2,of,4,RFC] clone: test streaming disabled because client is missing requirement 2017-05-09 Siddharth Agarwal Superseded
[1,of,4,RFC] bundle2: don't check for whether we can do stream clones 2017-05-09 Siddharth Agarwal Superseded
internals: document that "branches" is a legacy command 2017-05-03 Siddharth Agarwal Accepted
[STABLE] histedit: make check for unresolved conflicts explicit (issue5545) 2017-04-21 Siddharth Agarwal Accepted
[3,of,3,V2] bundle2: handle long error params on the unbundling side 2017-04-05 Siddharth Agarwal Changes Requested
[2,of,3,V2] bundle2: use bundleerrorparts for error parts with unbounded parameters 2017-04-05 Siddharth Agarwal Changes Requested
[1,of,3,V2] bundle2: add separate handling for error part creation 2017-04-05 Siddharth Agarwal Changes Requested
[3,of,3] bundle2: handle long error params on the unbundling side 2017-04-04 Siddharth Agarwal Superseded
[2,of,3] bundle2: use bundleerrorparts for error parts with unbounded parameters 2017-04-04 Siddharth Agarwal Superseded
[1,of,3] bundle2: add separate handling for error part creation 2017-04-04 Siddharth Agarwal Superseded
help: fix internals.changegroups 2017-03-02 Siddharth Agarwal Accepted
bundle2: fix assertion that 'compression' hasn't been set 2017-02-13 Siddharth Agarwal Accepted
merge: remove files with extra actions from merge action list 2016-08-24 Siddharth Agarwal Accepted
[4,of,4,V4,evolve-ext] metaedit: add support for folding commits while editing their metadata 2016-04-25 Siddharth Agarwal marmoute Accepted
[3,of,4,V4,evolve-ext] commands: introduce a new command to edit commit metadata 2016-04-25 Siddharth Agarwal marmoute Accepted
[2,of,4,V4,evolve-ext] evolve: factor out check for creating unstable commits 2016-04-25 Siddharth Agarwal marmoute Accepted
[1,of,4,V4,evolve-ext] evolve: factor out sanity checks for folds 2016-04-25 Siddharth Agarwal marmoute Accepted
[STABLE] make: backout changeset 51f5fae84e43 2016-04-25 Siddharth Agarwal Accepted
[4,of,4,V3,evolve-ext] metaedit: add support for folding commits while editing their metadata 2016-04-18 Siddharth Agarwal marmoute Superseded
[3,of,4,V3,evolve-ext] commands: introduce a new command to edit commit metadata 2016-04-18 Siddharth Agarwal marmoute Superseded
[2,of,4,V3,evolve-ext] evolve: factor out check for creating unstable commits 2016-04-18 Siddharth Agarwal marmoute Superseded
[1,of,4,V3,evolve-ext] evolve: factor out sanity checks for folds 2016-04-18 Siddharth Agarwal marmoute Superseded
[4,of,4,V2] resolve: wrap implementation in a ui.tempconfig context 2016-03-21 Siddharth Agarwal martinvonz Changes Requested
[3,of,4,V2] resolve: move no-match hint into main resolve function 2016-03-21 Siddharth Agarwal martinvonz Changes Requested
[2,of,4,V2] resolve: move implementation into cmdutil 2016-03-21 Siddharth Agarwal martinvonz Changes Requested
[1,of,4,V2] ui: add a context for temporary config changes 2016-03-21 Siddharth Agarwal martinvonz Changes Requested
[2,of,2] resolve: set forcemerge before calling preprocess 2016-03-21 Siddharth Agarwal Superseded
[1,of,2] ui: add a context for temporary config changes 2016-03-21 Siddharth Agarwal Superseded
[3,of,3,evolve-ext,V2] commands: introduce a new command to edit commit metadata 2016-03-20 Siddharth Agarwal lcharignon Changes Requested
[2,of,3,evolve-ext,V2] evolve: factor out check for creating unstable commits 2016-03-20 Siddharth Agarwal lcharignon Changes Requested
[1,of,3,evolve-ext,V2] evolve: factor out sanity checks for folds 2016-03-20 Siddharth Agarwal lcharignon Changes Requested
[V2] hook: filter out unstable output in tests 2016-03-10 Siddharth Agarwal Accepted
[3,of,3,evolve-ext,RFC] commands: introduce a new command to edit commit metadata 2016-03-10 Siddharth Agarwal lcharignon Changes Requested
[2,of,3,evolve-ext,RFC] evolve: factor out check for creating unstable commits 2016-03-10 Siddharth Agarwal lcharignon Changes Requested
[1,of,3,evolve-ext,RFC] evolve: factor out sanity checks for folds 2016-03-10 Siddharth Agarwal lcharignon Changes Requested
hook: filter out unstable output in tests 2016-03-10 Siddharth Agarwal yuya Superseded
[evolve-ext] fold: allow folding one revision with --exact if rewriting is necessary 2016-03-02 Siddharth Agarwal marmoute Changes Requested
[4,of,4] hook: don't crash on syntax errors in python hooks 2016-02-12 Siddharth Agarwal Accepted
[3,of,4] hook: for python hook exceptions, add note to run with --traceback 2016-02-12 Siddharth Agarwal Accepted
[2,of,4] hook: add tests for failing post- python hooks 2016-02-12 Siddharth Agarwal Accepted
[1,of,4] hook: even fewer parentheses for load errors 2016-02-12 Siddharth Agarwal Accepted
[3,of,3] hook: for python hook ImportErrors, add note to run with --traceback 2016-02-12 Siddharth Agarwal Accepted
[2,of,3] hook: fewer parentheses for hook load errors 2016-02-12 Siddharth Agarwal Accepted
[1,of,3] hook: use sys.exc_info rather than the deprecated equivalents 2016-02-12 Siddharth Agarwal Accepted
[5,of,5,STABLE,emergency-fix] rebase: don't preserve most extra fields 2016-02-03 Siddharth Agarwal Accepted
[4,of,5,STABLE,emergency-fix] rebase: backout changeset d755a9531fce 2016-02-03 Siddharth Agarwal Accepted
[3,of,5,STABLE,emergency-fix] rebase: backout changeset 986d04b9fedd 2016-02-03 Siddharth Agarwal Accepted
[2,of,5,STABLE,emergency-fix] graft: don't preserve most extra fields 2016-02-03 Siddharth Agarwal Accepted
[1,of,5,STABLE,emergency-fix] amend: don't preserve most extra fields 2016-02-03 Siddharth Agarwal Accepted
[STABLE] merge: don't try to merge subrepos twice (issue4988) 2016-01-29 Siddharth Agarwal Accepted
[STABLE] merge: undocument checkunknown and checkignored configs for 3.7 2016-01-27 Siddharth Agarwal Accepted
[STABLE,checkunknown] merge: respect checkunknown/checkignored when force is True 2016-01-22 Siddharth Agarwal Changes Requested
[3,of,3,checkunknown] merge: split up checks for unknown and ignored files that differ 2016-01-13 Siddharth Agarwal Accepted
[2,of,3,checkunknown] merge: determine what untracked conflicts cause warns and aborts separately 2016-01-13 Siddharth Agarwal Accepted
[1,of,3,checkunknown] merge: factor out code to get checkunknown config 2016-01-13 Siddharth Agarwal Accepted
[7,of,7,checkunknown] merge: add options to warn or ignore on colliding unknown files 2016-01-02 Siddharth Agarwal martinvonz Accepted
[6,of,7,checkunknown] batchget: add support for backing up files 2016-01-02 Siddharth Agarwal martinvonz Accepted
[5,of,7,checkunknown] merge: add a new 'backup' argument to get actions 2016-01-02 Siddharth Agarwal martinvonz Accepted
[4,of,7,checkunknown] _checkunknownfiles: turn 'conflicts' into a set 2016-01-02 Siddharth Agarwal martinvonz Accepted
[3,of,7,checkunknown] checkunknownfiles: make control flow clearer 2016-01-02 Siddharth Agarwal martinvonz Accepted
[2,of,7,checkunknown] _checkunknownfiles: rename 'aborts' to 'conflicts' 2016-01-02 Siddharth Agarwal martinvonz Accepted
[1,of,7,checkunknown] origpath: move from cmdutil to scmutil 2016-01-02 Siddharth Agarwal martinvonz Accepted
[3,of,3,STABLE] merge: while checking unknown files also check link flag (issue5027) 2015-12-29 Siddharth Agarwal Rejected
[2,of,3,STABLE] _checkunknownfiles: make the f2 argument mandatory 2015-12-29 Siddharth Agarwal Rejected
[1,of,3,STABLE] merge: while checking for unknown files don't follow symlinks (issue5027) 2015-12-29 Siddharth Agarwal Accepted
[4,of,4,mergedriver] filemerge: default change/delete conflicts to 'leave unresolved' (BC) 2015-12-23 Siddharth Agarwal durin42 Accepted
[3,of,4,mergedriver] test-rebase-newancestor.t: explicitly request changed version 2015-12-23 Siddharth Agarwal durin42 Accepted
[2,of,4,mergedriver] test-commit-amend.t: explicitly request changed version in c/d conflict 2015-12-23 Siddharth Agarwal durin42 Accepted
[1,of,4,mergedriver] test-copy-move-merge.t: explicitly request changed version 2015-12-23 Siddharth Agarwal durin42 Accepted
[2,of,2,STABLE?,V2] record: don't dereference symlinks while copying over stat data 2015-12-12 Siddharth Agarwal Accepted
[1,of,2,STABLE?,V2] copyfile: add an optional parameter to copy other stat data 2015-12-12 Siddharth Agarwal Accepted
[2,of,2,STABLE?] record: don't dereference symlinks while copying over timestamps 2015-12-12 Siddharth Agarwal Superseded
[1,of,2,STABLE?] copyfile: add an optional parameter to copy atime/mtime 2015-12-12 Siddharth Agarwal Superseded
[4,of,4,mergedriver] filemerge: default regular prompts to 'leave unresolved' (BC) 2015-12-01 Siddharth Agarwal Accepted
[3,of,4,mergedriver] filemerge: add a 'leave unresolved' option to change/delete prompts 2015-12-01 Siddharth Agarwal Accepted
[2,of,4,mergedriver] filemerge: add a 'leave unresolved' option to regular prompts 2015-12-01 Siddharth Agarwal Accepted
[1,of,4,mergedriver] filemerge: add debug output for whether this is a change/delete conflict 2015-12-01 Siddharth Agarwal Accepted
[STABLE] localrepo.commit: check all files for resolve state (issue4972) 2015-12-01 Siddharth Agarwal Accepted
[4,of,4,mergedriver] merge: move almost all change/delete conflicts to resolve phase (BC) (API) 2015-11-30 Siddharth Agarwal Accepted
[3,of,4,mergedriver] test-merge-changedelete.t: print out debugmergestate 2015-11-30 Siddharth Agarwal Accepted
[2,of,4,mergedriver] debugmergestate: also recognize change/delete conflicts in the merge state 2015-11-30 Siddharth Agarwal Accepted
[1,of,4,mergedriver] debugmergestate: print out null nodes as 'null' 2015-11-30 Siddharth Agarwal Accepted
[5,of,5,mergedriver] test-merge-force.t: check .orig files separately 2015-11-30 Siddharth Agarwal martinvonz Accepted
[4,of,5,mergedriver] merge.recordupdates: mark 'a' files as added unconditionally 2015-11-30 Siddharth Agarwal martinvonz Accepted
[3,of,5,mergedriver] merge: add a new action type representing files to add/mark as modified 2015-11-30 Siddharth Agarwal martinvonz Accepted
[2,of,5,mergedriver] mergestate: add a cached property accessor for the local context 2015-11-30 Siddharth Agarwal martinvonz Accepted
[1,of,5,mergedriver] mergestate: raise exception if otherctx is accessed but _other isn't set 2015-11-30 Siddharth Agarwal martinvonz Accepted
[5,of,6,mergedriver] test-merge-changedelete.t: add a file with regular merge conflicts 2015-11-28 Siddharth Agarwal Accepted
[6,of,6,mergedriver] test-merge-changedelete.t: add resolve --list output 2015-11-24 Siddharth Agarwal martinvonz Accepted
[5,of,6,mergedriver] test-merge-changedelete.t: add a file with regular merge conflicts 2015-11-24 Siddharth Agarwal martinvonz Superseded
[4,of,6,mergedriver] filemerge: in ':prompt', use ':fail' tool rather than returning directly 2015-11-24 Siddharth Agarwal martinvonz Accepted
[3,of,6,mergedriver] filemerge: in ':fail' tool, write out other side if local side is deleted 2015-11-24 Siddharth Agarwal martinvonz Accepted
[2,of,6,mergedriver] mergestate: explicitly forget 'dc' conflicts where the deleted side is picked 2015-11-24 Siddharth Agarwal martinvonz Accepted
[1,of,6,mergedriver] merge.applyupdates: add all actions returned from merge state 2015-11-24 Siddharth Agarwal martinvonz Accepted
[5,of,5,mergedriver] merge.applyupdates: create absentfilectxes for change/delete conflicts 2015-11-23 Siddharth Agarwal Accepted
[4,of,5,mergedriver] mergestate: add methods to queue files to remove, add or get 2015-11-23 Siddharth Agarwal Accepted
[3,of,5,mergedriver] resolve: record dirstate actions after performing resolutions 2015-11-23 Siddharth Agarwal Accepted
[2,of,5,mergedriver] mergestate: add a way to record pending dirstate actions 2015-11-23 Siddharth Agarwal Accepted
[1,of,5,mergedriver] merge.recordactions: don't require action keys to be present in dict 2015-11-23 Siddharth Agarwal Accepted
[shelve] shelve: use colon instead of quotes in 'changes to' description 2015-11-23 Siddharth Agarwal Accepted
[7,of,7,mergedriver] merge.applyupdates: extend action queues with ones returned from mergestate 2015-11-21 Siddharth Agarwal martinvonz Accepted
[6,of,7,mergedriver] mergestate: add a method to compute actions to perform on dirstate 2015-11-21 Siddharth Agarwal martinvonz Accepted
[5,of,7,mergedriver] merge.applyupdates: use counters from mergestate 2015-11-21 Siddharth Agarwal martinvonz Accepted
[4,of,7,mergedriver] mergestate: add a function to return the number of unresolved files 2015-11-21 Siddharth Agarwal martinvonz Accepted
[3,of,7,mergedriver] mergestate: add a method to return updated/merged/removed counts 2015-11-21 Siddharth Agarwal martinvonz Accepted
[2,of,7,mergedriver] mergestate._resolve: don't return the action any more 2015-11-21 Siddharth Agarwal martinvonz Accepted
[1,of,7,mergedriver] mergestate._resolve: store return code and action for each file 2015-11-21 Siddharth Agarwal martinvonz Accepted
[4,of,4,mergedriver] largefiles: fall back to the original for change/delete conflicts 2015-11-20 Siddharth Agarwal Accepted
[3,of,4,mergedriver] mergestate.add: store absentfilectxes as nullhex 2015-11-20 Siddharth Agarwal Accepted
[2,of,4,mergedriver] mergestate._resolve: handle change/delete conflicts 2015-11-20 Siddharth Agarwal Accepted
[1,of,4,mergedriver] filemerge: don't try to copy files known to be absent 2015-11-20 Siddharth Agarwal Accepted
[7,of,7,mergedriver] filemerge: don't try using external tools on change/delete conflicts 2015-11-19 Siddharth Agarwal martinvonz Accepted
[6,of,7,mergedriver] filemerge: don't attempt to premerge change/delete conflicts 2015-11-19 Siddharth Agarwal martinvonz Accepted
[5,of,7,mergedriver] filemerge._mergecheck: add check for change/delete conflicts 2015-11-19 Siddharth Agarwal martinvonz Accepted
[4,of,7,mergedriver] filemerge._picktool: only pick from nomerge tools for change/delete conflicts 2015-11-19 Siddharth Agarwal martinvonz Accepted
[3,of,7,mergedriver] filemerge: add support for change/delete conflicts to the ':prompt' tool 2015-11-19 Siddharth Agarwal martinvonz Accepted
[2,of,7,mergedriver] filemerge: add support for change/delete conflicts to the ':other' merge tool 2015-11-19 Siddharth Agarwal martinvonz Accepted
[1,of,7,mergedriver] filemerge: add support for change/delete conflicts to the ':local' merge tool 2015-11-19 Siddharth Agarwal martinvonz Accepted
[5,of,5,mergedriver,V2] merge.mergestate: compute dirstate action 2015-11-19 Siddharth Agarwal Accepted
[4,of,5,mergedriver,V2] filemerge: return whether the file was deleted 2015-11-19 Siddharth Agarwal Accepted
[3,of,5,mergedriver,V2] filemerge: return whether the file is deleted from all other merge tools 2015-11-19 Siddharth Agarwal Accepted
[2,of,5,mergedriver,V2] filemerge: return whether the file is deleted for nomerge internal tools 2015-11-19 Siddharth Agarwal Accepted
[1,of,5,mergedriver,V2] mergestate: allow storing and retrieving change/delete conflicts 2015-11-19 Siddharth Agarwal Accepted
[3,of,3,mergedriver,V4] mergestate: handle additional record types specially 2015-11-19 Siddharth Agarwal Accepted
[2,of,3,mergedriver,V4] test-resolve.t: remove completely unnecessary line 2015-11-19 Siddharth Agarwal Accepted
[1,of,3,mergedriver,V4] resolve: fix incorrect merge 2015-11-19 Siddharth Agarwal Accepted
[2,of,2,V3,mergedriver] mergestate: handle additional record types specially 2015-11-19 Siddharth Agarwal Superseded
[1,of,2,V3,mergedriver] mergestate: move binary format documentation into _readrecordsv2 2015-11-19 Siddharth Agarwal Superseded
[3,of,3,unshelve] unshelve: add support for custom merge tools 2015-11-18 Siddharth Agarwal Accepted
[2,of,3,unshelve] unshelve: shed spurious space 2015-11-18 Siddharth Agarwal Accepted
[1,of,3,unshelve] unshelve: add -k as short form of --keep 2015-11-18 Siddharth Agarwal Superseded
mergestate: handle additional record types specially 2015-11-18 Siddharth Agarwal marmoute Superseded
[4,of,4,mergedriver] mergestate: handle additional record types specially 2015-11-18 Siddharth Agarwal martinvonz Superseded
[3,of,4,mergedriver] mergestate.commit: factor out making the list of records 2015-11-18 Siddharth Agarwal martinvonz Accepted
[2,of,4,mergedriver] mergestate: move _read() call to read constructor 2015-11-18 Siddharth Agarwal martinvonz Accepted
[1,of,4,mergedriver] debugmergestate: explain why we create mergestate objects directly 2015-11-18 Siddharth Agarwal martinvonz Accepted
[7,of,7,mergedriver] test-resolve.t: switch to mergestate.read() 2015-11-18 Siddharth Agarwal Accepted
[6,of,7,mergedriver] localrepo.commit: switch to mergestate.read() 2015-11-18 Siddharth Agarwal Accepted
[5,of,7,mergedriver] fileset: switch to mergestate.read() 2015-11-18 Siddharth Agarwal Accepted
[4,of,7,mergedriver] commands.summary: switch to mergestate.read() 2015-11-18 Siddharth Agarwal Accepted
[3,of,7,mergedriver] commands.resolve: switch to mergestate.read() 2015-11-18 Siddharth Agarwal Accepted
[2,of,7,mergedriver] shelve: switch to mergestate.read() 2015-11-18 Siddharth Agarwal Accepted
[1,of,7,mergedriver] mergestate: add a constructor that reads state from disk 2015-11-18 Siddharth Agarwal Accepted
[4,of,4,V2,mergedriver] merge.applyupdates: switch to mergestate.clean() 2015-11-18 Siddharth Agarwal Accepted
[3,of,4,V2,mergedriver] localrepo: switch to mergestate.clean() 2015-11-18 Siddharth Agarwal Accepted
[2,of,4,V2,mergedriver] strip: switch to mergestate.clean() 2015-11-18 Siddharth Agarwal Accepted
[1,of,4,V2,mergedriver] mergestate: add a constructor that sets up a fresh merge state 2015-11-18 Siddharth Agarwal Accepted
[6,of,6,mergedriver] merge.applyupdates: switch to mergestate.fresh() 2015-11-17 Siddharth Agarwal Changes Requested
[5,of,6,mergedriver] localrepo: switch to mergestate.fresh() 2015-11-17 Siddharth Agarwal Changes Requested
[4,of,6,mergedriver] strip: switch to mergestate.fresh() 2015-11-17 Siddharth Agarwal Changes Requested
[3,of,6,mergedriver] mergestate: add a constructor that sets up a fresh merge state 2015-11-17 Siddharth Agarwal Changes Requested
[2,of,6,mergedriver] mergestate: raise structured exception for unsupported merge records 2015-11-17 Siddharth Agarwal Accepted
[1,of,6,mergedriver] error: add a structured exception for unsupported merge records 2015-11-17 Siddharth Agarwal Accepted
[7,of,7,mergedriver] mergestate: allow storing and retrieving change/delete conflicts 2015-11-16 Siddharth Agarwal Superseded
[6,of,7,mergedriver] node: add 'nullhex', hex-encoded nullid 2015-11-16 Siddharth Agarwal Accepted
[5,of,7,mergedriver] filemerge: introduce class whose objects represent files not in a context 2015-11-16 Siddharth Agarwal Accepted
[4,of,7,mergedriver] filectx: add isabsent method 2015-11-16 Siddharth Agarwal Accepted
[3,of,7,mergedriver] filectx: allow custom comparators 2015-11-16 Siddharth Agarwal Accepted
[2,of,7,mergedriver] debugmergestate: print out record type for files 2015-11-16 Siddharth Agarwal Accepted
[1,of,7,mergedriver] merge.applyupdates: don't return early if merge driver's conclude failed 2015-11-16 Siddharth Agarwal Accepted
[2,of,2,V2] merge: make 'cd' and 'dc' actions store the same arguments as 'm' 2015-11-14 Siddharth Agarwal Accepted
[1,of,2,V2] merge: stop emptying out 'cd' and 'dc' actions 2015-11-14 Siddharth Agarwal Accepted
[STABLE] resolve: restore .orig only after merge is fully complete (issue4952) 2015-11-13 Siddharth Agarwal Accepted
[2,of,2] merge: make 'cd' and 'dc' actions store the same arguments as 'm' 2015-11-13 Siddharth Agarwal Superseded
[1,of,2] merge: stop emptying out 'cd' and 'dc' actions 2015-11-13 Siddharth Agarwal Superseded
[5,of,5] merge.applyupdates: only attempt to merge files in mergeactions 2015-11-12 Siddharth Agarwal Accepted
[4,of,5] test-merge-remove.t: unset HGMERGE 2015-11-12 Siddharth Agarwal durin42 Changes Requested
[3,of,5] test-commit-amend.t: unset HGMERGE 2015-11-12 Siddharth Agarwal durin42 Changes Requested
[2,of,5] filemerge: rename _symlinkcheck to _mergecheck 2015-11-12 Siddharth Agarwal Accepted
[3,of,3,STABLE?] resolve: don't abort when file is missing 2015-11-11 Siddharth Agarwal Accepted
[2,of,3,STABLE?] filemerge: treat EOF at prompt as fail, not abort 2015-11-11 Siddharth Agarwal Accepted
[1,of,3,STABLE?] test-merge-tools.t: add 'hg resolve --list' output to tests 2015-11-11 Siddharth Agarwal Accepted
[2,of,2] error: add structured exception for EOF at prompt 2015-11-10 Siddharth Agarwal Accepted
[1,of,2] test-merge-prompt.t: unset HGMERGE 2015-11-10 Siddharth Agarwal Accepted
[2,of,2] filemerge: move :merge-local/other symlink check to precheck 2015-11-09 Siddharth Agarwal Accepted
[1,of,2] test-merge-types.t: add tests for :merge-local/:merge-other with symlinks 2015-11-09 Siddharth Agarwal Accepted
[5,of,5,changedelete] merge.mergestate: return dirstate action from _resolve 2015-11-05 Siddharth Agarwal Superseded
[4,of,5,changedelete] merge.mergestate: update docstrings for preresolve and resolve 2015-11-05 Siddharth Agarwal Accepted
[3,of,5,changedelete] filemerge: return dirstate action 2015-11-05 Siddharth Agarwal Superseded
[2,of,5,changedelete] filemerge: return dirstate action from all other merge tools 2015-11-05 Siddharth Agarwal Superseded
[1,of,5,changedelete] filemerge: also return a dirstate action for nomerge internal tools 2015-11-05 Siddharth Agarwal Superseded
[5,of,5] merge.mergestate: expose branch merge info via a method 2015-11-03 Siddharth Agarwal Changes Requested
[4,of,5] merge.mergestate: store whether the merge is a branch merge 2015-11-03 Siddharth Agarwal Changes Requested
[3,of,5] merge.applyupdates: pass in branch merge info 2015-11-03 Siddharth Agarwal Changes Requested
[2,of,5] commands.debugmergestate: print out branch merge info 2015-11-03 Siddharth Agarwal Changes Requested
[1,of,5] test-merge-local.t: print out merge state after attempting merge 2015-11-03 Siddharth Agarwal Changes Requested
[5,of,5] filemerge.prompt: separate out choice selection and action 2015-11-02 Siddharth Agarwal Accepted
[4,of,5] test-merge-prompt.t: add tests for linear updates + change/delete conflicts 2015-11-02 Siddharth Agarwal Accepted
[3,of,5] test-pathencode.py: drop support for Python 2.4 2015-11-02 Siddharth Agarwal Accepted
[2,of,5] hgweb.server: drop support for Python 2.4 2015-11-02 Siddharth Agarwal Accepted
[1,of,5] util: drop Python 2.4 compat by directly importing md5 and sha1 2015-11-02 Siddharth Agarwal Accepted
[7,of,7,mergedriver] commands.resolve: print out warning when only driver-resolved files remain 2015-10-17 Siddharth Agarwal Accepted
[6,of,7,mergedriver] merge.mergestate: set merge driver state to 's' if there's none present 2015-10-17 Siddharth Agarwal Accepted
[5,of,7,mergedriver] merge.mergestate: only check for merge driver when property is accessed 2015-10-17 Siddharth Agarwal Accepted
[4,of,7,mergedriver] localrepo.commit: abort if merge driver's conclude step hasn't been run yet 2015-10-17 Siddharth Agarwal Accepted
[3,of,7,mergedriver] merge.mergestate: add a way to get the merge driver state 2015-10-17 Siddharth Agarwal Accepted
[2,of,7,mergedriver] merge.mergestate: add a way to get the other side of the merge 2015-10-17 Siddharth Agarwal Accepted
[1,of,7,mergedriver] commands.resolve: support printing out driver-resolved files 2015-10-17 Siddharth Agarwal Accepted
[6,of,6,mergedriver] localrepo.commit: disallow commit when driver-resolved files exist 2015-10-14 Siddharth Agarwal marmoute Accepted
[5,of,6,mergedriver] merge.mergestate: add a generator for driver-resolved files 2015-10-14 Siddharth Agarwal marmoute Accepted
[4,of,6,mergedriver] hook: for python hooks, also return whether an exception was raised 2015-10-14 Siddharth Agarwal marmoute Accepted
[3,of,6,mergedriver] hook.runhooks: return a dict of result values 2015-10-14 Siddharth Agarwal marmoute Accepted
[2,of,6,mergedriver] hook: factor out determination of hooks from running them 2015-10-14 Siddharth Agarwal marmoute Accepted
[1,of,6,mergedriver] hook: raise a separate exception for when loading a hook fails 2015-10-14 Siddharth Agarwal Accepted
[5,of,5,mergedriver,V2] debugmergestate: add support for printing out driver-resolved files 2015-10-13 Siddharth Agarwal Accepted
[4,of,5,mergedriver,V2] debugmergestate: add support for printing out merge driver 2015-10-13 Siddharth Agarwal Accepted
[3,of,5,mergedriver,V2] merge.mergedriver: don't try resolving files marked driver-resolved 2015-10-13 Siddharth Agarwal Accepted
[2,of,5,mergedriver,V2] merge.mergestate: add support for persisting driver-resolved files 2015-10-13 Siddharth Agarwal Accepted
[1,of,5,mergedriver,V2] merge.mergestate: add support for persisting a custom merge driver 2015-10-13 Siddharth Agarwal Accepted
[5,of,5,mergedriver] debugmergestate: add support for printing out driver-resolved files 2015-10-13 Siddharth Agarwal Superseded
[4,of,5,mergedriver] debugmergestate: add support for printing out merge driver 2015-10-13 Siddharth Agarwal Superseded
[3,of,5,mergedriver] merge.mergedriver: don't try resolving files marked driver-resolved 2015-10-13 Siddharth Agarwal Superseded
[2,of,5,mergedriver] merge.mergestate: add support for persisting driver-resolved files 2015-10-13 Siddharth Agarwal Superseded
[1,of,5,mergedriver] merge.mergestate: add support for persisting a custom merge driver 2015-10-13 Siddharth Agarwal Superseded
[6,of,6,mergedriver] merge.mergestate: perform all premerges before any merges (BC) 2015-10-12 Siddharth Agarwal Accepted
[5,of,6,mergedriver] merge: introduce a preresolve function 2015-10-12 Siddharth Agarwal Accepted
[4,of,6,mergedriver] merge.mergestate._resolve: also return completed status 2015-10-12 Siddharth Agarwal Accepted