darcs

Patch 920 add rebase command (and 51 more)

Bug Tracker Home

Issues
Show Unassigned
 Show All
Search Issues

Patches
Show Open
 Show All
Search Patches

Login




Register
Lost your login?

Help
Roundup docs

Title add rebase command (and 51 more)
Superseder Nosy List ganesh, owst
Related Issues
Status accepted Assigned To owst
Milestone

Created on 2012-08-27.21:52:49 by ganesh, last changed 2012-11-12.01:06:50 by darcswatch. Tracked on DarcsWatch.

Files
File name Status Uploaded Type Edit Remove
add-rebase-command.dpatch ganesh, 2012-08-27.21:52:47 text/x-darcs-patch
document-namehack.dpatch ganesh, 2012-10-21.00:44:25 application/x-darcs-patch
patch-preview.txt ganesh, 2012-10-21.00:44:25 text/x-darcs-patch
unnamed ganesh, 2012-08-27.21:52:47
unnamed ganesh, 2012-10-21.00:44:25
See mailing list archives for discussion on individual patches.
Messages
msg16028 (view) Author: ganesh Date: 2012-08-27.21:52:47 
Here's the rebase bundle, which I've just pushed to screened.

52 patches for repository /home/ganesh/darcs/darcs-screened-temp:

Mon Aug 27 14:05:51 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add rebase command

Mon Aug 27 14:10:02 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * PatchDebug instances for rebase

Mon Aug 27 14:25:51 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add mechanism for marking patches as 'internal'
  such patches are automatically excluded by an implicit matcher and
  thus not presented to the user

Mon Aug 27 14:26:52 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * test for eliminating the rebase patch from the UI

Mon Aug 27 14:34:04 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add test of tagging a rebasing repo

Mon Aug 27 14:40:02 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * addHack needs to recognise tags, which have no contents

Mon Aug 27 14:46:07 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * ignore internal patches when tagging

Mon Aug 27 15:29:38 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add test of pulling a tag into a rebasing repo

Mon Aug 27 15:30:06 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * rebase obliterate command

Mon Aug 27 15:33:45 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * todo item

Mon Aug 27 15:33:48 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * update name of rebase patch

Mon Aug 27 15:33:52 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add mapFL_FL_M

Mon Aug 27 15:34:02 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * fix typo in comment

Mon Aug 27 15:34:02 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add test for rebase to track explicit deps/tags

Mon Aug 27 15:34:02 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * hacky summary display

Mon Aug 27 15:34:02 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * document takeHeadRebase

Mon Aug 27 15:44:29 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add tentativelyAddPatches_

Mon Aug 27 15:44:34 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * command to reify fixups

Mon Aug 27 16:05:08 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * commute rebase patch to head of repo lazily

Mon Aug 27 17:44:36 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add description to RebaseSelect

Mon Aug 27 17:45:07 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * generalise type of fmapFL_Named

Mon Aug 27 17:45:10 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add rebase inject

Mon Aug 27 17:45:15 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * todo items

Mon Aug 27 18:05:20 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * move adding patches to a where clause

Mon Aug 27 18:05:31 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add infrastructure for total commuters

Mon Aug 27 18:13:55 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * initial version of name tracking during rebase
  Dependencies are tracked correctly during unsuspend,
  but not yet during amend-record.
  

Mon Aug 27 18:23:54 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * fix showPatch for RebaseName

Mon Aug 27 18:23:54 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * fix forceCommuteName

Mon Aug 27 18:44:27 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * simplify the way rebase hints work

Mon Aug 27 18:52:20 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * move RebaseName out into its own module to help dependencies

Mon Aug 27 19:11:23 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * rebase: track renames from amend-record

Mon Aug 27 19:12:02 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * don't insist on all patches in a Named having the same polarity
  Historic rollback patches wrote out inverted names, although
  modern darcs doesn't do this (so perhaps we could insist on this for v2
  patches?)
  

Mon Aug 27 19:12:02 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * support --reverse for rebase suspend

Mon Aug 27 19:12:02 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add some selection options to rebase suspend

Mon Aug 27 19:40:46 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * add some selection options to rebase unsuspend
  This involves adding a bunch of infrastructure to allow matchers etc
  to work on RebaseSelect patches

Mon Aug 27 19:46:07 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * simplify test

Mon Aug 27 19:46:36 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * refactor Fixups

Mon Aug 27 19:53:16 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * make amend-record handling more robust

Mon Aug 27 20:08:00 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * initial check/repair for the rebase state

Mon Aug 27 20:08:01 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * test to expose bug in rebase-block handling

Mon Aug 27 20:43:30 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * rework how we handle the rebase patch during amend-record
  The previous attempt to use "block" and "unblock" didn't work
  because by the time of the unblock operation the rebase patch was
  buried beneath the re-added patch.
  
  

Mon Aug 27 20:46:49 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * fix bug when a fresh copy of a suspended patch is pulled

Mon Aug 27 20:46:49 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * reify name fixup into an empty patch

Mon Aug 27 20:54:28 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * give "internal patches" their own module/class

Mon Aug 27 21:04:00 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * move RecontextRebase out into its own module

Mon Aug 27 21:22:43 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * make Darcs.Repository.Rebase module

Mon Aug 27 22:07:08 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * move some stuff out of Darcs.Repository.Job into .Rebase

Mon Aug 27 22:07:21 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * extract nameHack into its own class/module

Mon Aug 27 22:17:28 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * tidy exports

Mon Aug 27 22:17:28 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * tidy and comment Rebasing and RebaseItem

Mon Aug 27 22:17:28 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * tidy/comment commuterRebasing

Mon Aug 27 22:17:28 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * note about the rebase representation
Attachments
msg16031 (view) Author: darcswatch Date: 2012-08-27.22:09:26 
This patch bundle (with 58 patches) was just applied to the repository http://darcs.net/screened.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_screened.html#bundle-ec4c861580e1706ffc995f01b63f9761d2e9ff03
msg16241 (view) Author: owst Date: 2012-10-16.22:05:45 
I'm going to have a go at reviewing this... wish me luck!
msg16256 (view) Author: ganesh Date: 2012-10-21.00:44:25 
2 patches for repository darcs-unstable@darcs.net:screened:

Sun Oct 21 01:40:28 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * document NameHack

Sun Oct 21 01:41:22 BST 2012  Ganesh Sittampalam <ganesh@earth.li>
  * document PatchType
Attachments
msg16353 (view) Author: owst Date: 2012-11-11.23:41:12 
Finished review, with only a few comments, which I put in patch969.
Accepting, woo hoo!
msg16358 (view) Author: darcswatch Date: 2012-11-12.01:06:50 
This patch bundle (with 58 patches) was just applied to the repository http://darcs.net/reviewed.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-ec4c861580e1706ffc995f01b63f9761d2e9ff03
History
Date User Action Args
2012-08-27 21:52:49ganeshcreate
2012-08-27 21:54:23ganeshsetstatus: needs-screening -> needs-review
2012-08-27 21:56:06darcswatchsetdarcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-ec4c861580e1706ffc995f01b63f9761d2e9ff03
2012-08-27 22:09:26darcswatchsetmessages: + msg16031
2012-10-16 22:05:45owstsetstatus: needs-review -> review-in-progress
assignedto: owst
messages: + msg16241
nosy: + owst
2012-10-21 00:44:25ganeshsetfiles: + patch-preview.txt, document-namehack.dpatch, unnamed
messages: + msg16256
2012-11-11 23:41:12owstsetstatus: review-in-progress -> accepted-pending-tests
messages: + msg16353
2012-11-12 00:47:40owstsetstatus: accepted-pending-tests -> accepted
2012-11-12 01:06:50darcswatchsetmessages: + msg16358