* StGit: kha/{stable,safe,experimental} updated
@ 2008-04-13 19:11 Karl Hasselström
2008-04-14 6:44 ` Samuel Tardieu
2008-04-15 0:26 ` Karl Hasselström
0 siblings, 2 replies; 12+ messages in thread
From: Karl Hasselström @ 2008-04-13 19:11 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
I've rebased my branches on top of Catalin's latest master and stable.
They include all the patches I've sent to the list recently.
I've added a "stable" branch, for patches intended for Catalin's
"stable".
In the experimental branch, I've updated the reset command a bit -- it
should now be quite usable. Bug reports and feature requests and
general comments welcome. (Note to those who already run my
experimental branch: I've changed the stack log format, so you'll have
to nuke your <branchname>.stgit branches. StGit will remind you if you
forget.)
-+-
The following changes since commit bd3f01319a03fc883d391f24639176f0f65727e5:
Catalin Marinas (1):
Release 0.14.2
are available in the git repository at:
git://repo.or.cz/stgit/kha.git stable
Karl Hasselström (1):
Fix problems in t1000-branch-create
t/t1000-branch-create.sh | 56 +++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 20 deletions(-)
-+-
The following changes since commit 719309aa54c8fa43bd8700f09b1e293923ed4e0a:
Catalin Marinas (1):
Merge branch 'stable'
are available in the git repository at:
git://repo.or.cz/stgit/kha.git safe
Karl Hasselström (5):
Fix problems in t1000-branch-create
Merge branch 'stable' into stable-master-merge
Don't both change directory and set GIT_WORK_TREE
Log environment and cwd as well as the actual command
emacs mode: handle "stg status" output with #
contrib/stgit.el | 2 +-
stgit/lib/git.py | 14 +++++++----
stgit/run.py | 6 +++++
t/t1000-branch-create.sh | 56 +++++++++++++++++++++++++++++----------------
4 files changed, 52 insertions(+), 26 deletions(-)
-+-
The following changes since commit 999dcbc241e377f8b39f0064dd8cc1670e667f18:
Karl Hasselström (1):
emacs mode: handle "stg status" output with #
are available in the git repository at:
git://repo.or.cz/stgit/kha.git experimental
Karl Hasselström (12):
Disable patchlog test for "stg new"
Convert "stg new" to the new infrastructure
Refactor --author/--committer options
Let "stg new" support more message options
Emacs mode: use "stg new --file"
Convert "stg delete" to the new infrastructure
Emacs mode: delete patches
Add property with a list of all patch names
Library functions for tree and blob manipulation
Write to a stack log when stack is modified
Add utility function for reordering patches
New command: stg reset
contrib/stgit.el | 33 +++++++---
stgit/commands/branch.py | 18 ++++--
stgit/commands/clone.py | 3 +-
stgit/commands/coalesce.py | 3 +-
stgit/commands/commit.py | 6 +-
stgit/commands/common.py | 33 +++-------
stgit/commands/delete.py | 70 ++++++---------------
stgit/commands/edit.py | 26 +-------
stgit/commands/float.py | 3 +
stgit/commands/fold.py | 3 +-
stgit/commands/imprt.py | 3 +-
stgit/commands/init.py | 3 +-
stgit/commands/new.py | 97 ++++++++++++++++-------------
stgit/commands/pick.py | 4 +-
stgit/commands/pop.py | 3 +-
stgit/commands/pull.py | 3 +-
stgit/commands/push.py | 6 +-
stgit/commands/rebase.py | 4 +-
stgit/commands/refresh.py | 4 +-
stgit/commands/rename.py | 4 +-
stgit/commands/reset.py | 67 ++++++++++++++++++++
stgit/commands/resolved.py | 4 +-
stgit/commands/sink.py | 3 +-
stgit/commands/sync.py | 5 +-
stgit/commands/uncommit.py | 2 +-
stgit/lib/git.py | 147 ++++++++++++++++++++++++++++++++++++--------
stgit/lib/log.py | 130 ++++++++++++++++++++++++++++++++++++++
stgit/lib/stack.py | 1 +
stgit/lib/transaction.py | 17 +++++-
stgit/main.py | 2 +
stgit/utils.py | 50 +++++++++++++++
t/t1400-patch-history.sh | 2 -
t/t1600-delete-one.sh | 8 +-
33 files changed, 559 insertions(+), 208 deletions(-)
create mode 100644 stgit/commands/reset.py
create mode 100644 stgit/lib/log.py
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: StGit: kha/{stable,safe,experimental} updated
2008-04-13 19:11 Karl Hasselström
@ 2008-04-14 6:44 ` Samuel Tardieu
2008-04-14 7:03 ` Karl Hasselström
2008-04-15 0:26 ` Karl Hasselström
1 sibling, 1 reply; 12+ messages in thread
From: Samuel Tardieu @ 2008-04-14 6:44 UTC (permalink / raw)
To: Karl Hasselström; +Cc: Catalin Marinas, git
>>>>> "Karl" == Karl Hasselström <kha@treskal.com> writes:
Karl> In the experimental branch, I've updated the reset command a bit
Karl> -- it should now be quite usable. Bug reports and feature
Karl> requests and general comments welcome. (Note to those who
Karl> already run my experimental branch: I've changed the stack log
Karl> format, so you'll have to nuke your <branchname>.stgit
Karl> branches. StGit will remind you if you forget.)
Karl,
I was using the StGit in Debian/unstable and just switched to your
experimental branch.
When doing "stg pull", I get, at the end:
Pushing patch "pr20822" ... done
Pushing patch "pr22387" ... done
Pushing patch "pr30614" ... done
Error: Unhandled exception:
Traceback (most recent call last):
File "/usr/local/lib/python2.4/site-packages/stgit/main.py", line
280, in main
ret = command.func(parser, options, args)
File
"/usr/local/lib/python2.4/site-packages/stgit/commands/pull.py",
line 109, in func
log.log_entry(log.default_stack(), 'stg pull')
File "/usr/local/lib/python2.4/site-packages/stgit/lib/log.py", line
45, in log_entry
stack.repository.refs.get(ref))]
File "/usr/local/lib/python2.4/site-packages/stgit/lib/log.py", line
94, in __init__
self.unapplied, patches = pl('unapplied')
File "/usr/local/lib/python2.4/site-packages/stgit/lib/log.py", line
89, in pl
return ([pn for sha1, pn in patches],
ValueError: need more than 0 values to unpack
Note that I have no unapplied patch in case it matters, only hidden
ones (and applied ones of course).
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: StGit: kha/{stable,safe,experimental} updated
2008-04-14 6:44 ` Samuel Tardieu
@ 2008-04-14 7:03 ` Karl Hasselström
2008-04-14 8:11 ` Karl Hasselström
0 siblings, 1 reply; 12+ messages in thread
From: Karl Hasselström @ 2008-04-14 7:03 UTC (permalink / raw)
To: Samuel Tardieu; +Cc: Catalin Marinas, git
On 2008-04-14 08:44:29 +0200, Samuel Tardieu wrote:
> I was using the StGit in Debian/unstable and just switched to your
> experimental branch.
>
> When doing "stg pull", I get, at the end:
>
> Pushing patch "pr20822" ... done
> Pushing patch "pr22387" ... done
> Pushing patch "pr30614" ... done
> Error: Unhandled exception:
> Traceback (most recent call last):
> File "/usr/local/lib/python2.4/site-packages/stgit/main.py", line
> 280, in main
> ret = command.func(parser, options, args)
> File
> "/usr/local/lib/python2.4/site-packages/stgit/commands/pull.py",
> line 109, in func
> log.log_entry(log.default_stack(), 'stg pull')
> File "/usr/local/lib/python2.4/site-packages/stgit/lib/log.py", line
> 45, in log_entry
> stack.repository.refs.get(ref))]
> File "/usr/local/lib/python2.4/site-packages/stgit/lib/log.py", line
> 94, in __init__
> self.unapplied, patches = pl('unapplied')
> File "/usr/local/lib/python2.4/site-packages/stgit/lib/log.py", line
> 89, in pl
> return ([pn for sha1, pn in patches],
> ValueError: need more than 0 values to unpack
Euh! Thanks for the report, I'll look into it tonight after work.
> Note that I have no unapplied patch in case it matters, only hidden
> ones (and applied ones of course).
Yeah, that might be a clue. Though I was under the impression that I'd
tested it with a fully applied stack ... I guess the test suite needs
an addition or two.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: StGit: kha/{stable,safe,experimental} updated
2008-04-14 7:03 ` Karl Hasselström
@ 2008-04-14 8:11 ` Karl Hasselström
2008-04-14 20:08 ` Karl Hasselström
0 siblings, 1 reply; 12+ messages in thread
From: Karl Hasselström @ 2008-04-14 8:11 UTC (permalink / raw)
To: Samuel Tardieu; +Cc: Catalin Marinas, git
On 2008-04-14 09:03:48 +0200, Karl Hasselström wrote:
> Though I was under the impression that I'd tested it with a fully
> applied stack ... I guess the test suite needs an addition or two.
The real proble turned out to be a certain developer who remembers
running the test suite before pushing out his branches, even though no
such thing occurred. Ahem.
This fixes the bug for me; I'll be squashing it into one of the other
patches tonight. Sorry for the breakage.
diff --git a/stgit/lib/log.py b/stgit/lib/log.py
index 083a546..1830cbd 100644
--- a/stgit/lib/log.py
+++ b/stgit/lib/log.py
@@ -84,7 +84,7 @@ class Log(object):
def pl(name):
patches = [x.split() for x in
self.commit.data.tree.data.entries[name][1]
- .data.str.strip().split('\n')]
+ .data.str.strip().split('\n') if x]
# TODO: handle case where we don't have the commit object.
return ([pn for sha1, pn in patches],
dict((pn, repo.get_commit(sha1)) for sha1, pn in patches))
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: StGit: kha/{stable,safe,experimental} updated
2008-04-14 8:11 ` Karl Hasselström
@ 2008-04-14 20:08 ` Karl Hasselström
0 siblings, 0 replies; 12+ messages in thread
From: Karl Hasselström @ 2008-04-14 20:08 UTC (permalink / raw)
To: Samuel Tardieu; +Cc: Catalin Marinas, git
On 2008-04-14 10:11:39 +0200, Karl Hasselström wrote:
> This fixes the bug for me; I'll be squashing it into one of the
> other patches tonight. Sorry for the breakage.
Done, and pushed out.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: StGit: kha/{stable,safe,experimental} updated
2008-04-13 19:11 Karl Hasselström
2008-04-14 6:44 ` Samuel Tardieu
@ 2008-04-15 0:26 ` Karl Hasselström
1 sibling, 0 replies; 12+ messages in thread
From: Karl Hasselström @ 2008-04-15 0:26 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
On 2008-04-13 21:11:40 +0200, Karl Hasselström wrote:
> I've rebased my branches on top of Catalin's latest master and
> stable. They include all the patches I've sent to the list recently.
Updated again with the newest stuff. No shortlog since it's hardly
changed since last post. Get it here:
git://repo.or.cz/stgit/kha.git stable
git://repo.or.cz/stgit/kha.git safe
git://repo.or.cz/stgit/kha.git experimental
And this time I made _sure_ to run the test suite.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 12+ messages in thread
* StGit: kha/{stable,safe,experimental} updated
@ 2008-07-15 19:58 Karl Hasselström
0 siblings, 0 replies; 12+ messages in thread
From: Karl Hasselström @ 2008-07-15 19:58 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
It's been a while since I sent one of these updates.
Catalin, you probably want to pull stable and safe, to get Miklos's
setup.py fixes (I backported them to stable, and then merged back to
the main branch). (The stable branch has a handful of fixes since
0.14.3; it might be time for 0.14.4?)
-+-
The following changes since commit a6c4be12abcf0906a63de8a72c887c360f89ea82:
Karl Hasselström (1):
Don't allow extra diff options with "stg status"
are available in the git repository at:
git://repo.or.cz/stgit/kha.git stable
Miklos Vajna (2):
setup.py: don't try to import stgit.run before the python version check
setup.py: fix error message when running with python-2.3
setup.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
-+-
The following changes since commit 2e37b61d886ef21200007b57f496aaf182f42705:
Karl Hasselström (1):
Test for "stg edit"
are available in the git repository at:
git://repo.or.cz/stgit/kha.git safe
Karl Hasselström (1):
Merge branch 'stable'
Miklos Vajna (2):
setup.py: don't try to import stgit.run before the python version check
setup.py: fix error message when running with python-2.3
setup.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
-+-
The following changes since commit d8461a9dfb9a34e582019de5a67798fad44f42c7:
Karl Hasselström (1):
Merge branch 'stable'
are available in the git repository at:
git://repo.or.cz/stgit/kha.git experimental
Karl Hasselström (21):
Discard stderr output from git apply if the caller wants
Do simple in-index merge with diff+apply instead of read-tree
Reuse the same temp index in a transaction
Library functions for tree and blob manipulation
Write to a stack log when stack is modified
Add utility function for reordering patches
New command: stg reset
Log conflicts separately
Log conflicts separately for all commands
Add a --hard flag to stg reset
Don't write a log entry if there were no changes
Move stack reset function to a shared location
New command: stg undo
New command: stg redo
Log and undo external modifications
Make "stg log" show stack log instead of patch log
Convert "stg refresh" to the new infrastructure
New refresh tests
Remove --undo flags from stg commands and docs
Refactor stgit.commands.edit
Implement "stg refresh --edit" again
Documentation/tutorial.txt | 4 +-
TODO | 2 -
stgit/commands/branch.py | 19 +-
stgit/commands/clone.py | 2 +-
stgit/commands/coalesce.py | 2 +-
stgit/commands/common.py | 18 +-
stgit/commands/diff.py | 6 +-
stgit/commands/edit.py | 82 +------
stgit/commands/export.py | 2 +-
stgit/commands/files.py | 6 +-
stgit/commands/float.py | 2 +-
stgit/commands/fold.py | 2 +-
stgit/commands/goto.py | 3 +-
stgit/commands/hide.py | 2 +-
stgit/commands/id.py | 2 +-
stgit/commands/imprt.py | 4 +-
stgit/commands/log.py | 169 ++++---------
stgit/commands/mail.py | 8 +-
stgit/commands/new.py | 3 +-
stgit/commands/patches.py | 2 +-
stgit/commands/pick.py | 2 +-
stgit/commands/pop.py | 4 +-
stgit/commands/pull.py | 2 +-
stgit/commands/push.py | 31 +--
stgit/commands/rebase.py | 4 +-
stgit/commands/redo.py | 52 ++++
stgit/commands/refresh.py | 338 +++++++++++++++++---------
stgit/commands/rename.py | 2 +-
stgit/commands/repair.py | 11 +-
stgit/commands/reset.py | 57 +++++
stgit/commands/resolved.py | 2 +-
stgit/commands/show.py | 2 +-
stgit/commands/sink.py | 2 +-
stgit/commands/status.py | 3 +-
stgit/commands/sync.py | 26 +--
stgit/commands/undo.py | 49 ++++
stgit/commands/unhide.py | 2 +-
stgit/git.py | 4 -
stgit/lib/edit.py | 99 ++++++++
stgit/lib/git.py | 348 +++++++++++++++++++++++-----
stgit/lib/log.py | 537 ++++++++++++++++++++++++++++++++++++++++++
stgit/lib/stack.py | 25 ++
stgit/lib/transaction.py | 139 ++++++++---
stgit/main.py | 8 +
stgit/stack.py | 45 +----
stgit/utils.py | 18 +-
t/t1200-push-modified.sh | 2 +-
t/t1201-pull-trailing.sh | 2 +-
t/t1202-push-undo.sh | 8 +-
t/t1400-patch-history.sh | 103 --------
t/t2300-refresh-subdir.sh | 29 +++-
t/t3100-reset.sh | 151 ++++++++++++
t/t3101-reset-hard.sh | 56 +++++
t/t3102-undo.sh | 86 +++++++
t/t3103-undo-hard.sh | 56 +++++
t/t3104-redo.sh | 122 ++++++++++
t/t3105-undo-external-mod.sh | 68 ++++++
t/t3300-edit.sh | 4 +-
58 files changed, 2179 insertions(+), 660 deletions(-)
create mode 100644 stgit/commands/redo.py
create mode 100644 stgit/commands/reset.py
create mode 100644 stgit/commands/undo.py
create mode 100644 stgit/lib/edit.py
create mode 100644 stgit/lib/log.py
delete mode 100755 t/t1400-patch-history.sh
create mode 100755 t/t3100-reset.sh
create mode 100755 t/t3101-reset-hard.sh
create mode 100755 t/t3102-undo.sh
create mode 100755 t/t3103-undo-hard.sh
create mode 100755 t/t3104-redo.sh
create mode 100755 t/t3105-undo-external-mod.sh
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 12+ messages in thread
* StGit: kha/{stable,safe,experimental} updated
@ 2008-07-25 1:39 Karl Hasselström
2008-07-27 8:44 ` Catalin Marinas
0 siblings, 1 reply; 12+ messages in thread
From: Karl Hasselström @ 2008-07-25 1:39 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git, Samuel Tardieu
The big update since last time is support (in kha/experimental) for
hidden patches in the new-infrastructure commands and stack log.
Unless more problems are uncovered, I'll soon move all patches in
experimental to safe (which means I'll be recommending that Catalin
merge them).
-+-
The following changes since commit a6c4be12abcf0906a63de8a72c887c360f89ea82:
Karl Hasselström (1):
Don't allow extra diff options with "stg status"
are available in the git repository at:
git://repo.or.cz/stgit/kha.git stable
Daniel White (1):
Fixed default install location
Karl Hasselström (1):
Test that we can add a new file to a non-topmost patch with refresh -p
Miklos Vajna (2):
setup.py: don't try to import stgit.run before the python version check
setup.py: fix error message when running with python-2.3
setup.cfg | 2 +-
setup.py | 4 ++--
t/t2701-refresh-p.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+), 3 deletions(-)
create mode 100755 t/t2701-refresh-p.sh
-+-
The following changes since commit 2e37b61d886ef21200007b57f496aaf182f42705:
Karl Hasselström (1):
Test for "stg edit"
are available in the git repository at:
git://repo.or.cz/stgit/kha.git safe
Daniel White (1):
Fixed default install location
Karl Hasselström (19):
Test that we can add a new file to a non-topmost patch with refresh -p
Merge branch 'stable'
Test for exit code with command_error()
stg uncommit should never touch the branch head
Make sure that stg uncommit doesn't touch the branch head
Fix uncommit status message
Discard stderr output from git apply if the caller wants
Do simple in-index merge with diff+apply instead of read-tree
Reuse the same temp index in a transaction
Library functions for tree and blob manipulation
Teach stgit.lib.transaction about hidden patches
Test operations on hidden patches
stg goto: Handle hidden patches more gracefully
Add utility function for reordering patches
Add some performance testing scripts
Log subprocess activity to a file
Show full command in subprocess profiling
Log subprocess calls during performance testing
Global performance logging
Miklos Vajna (2):
setup.py: don't try to import stgit.run before the python version check
setup.py: fix error message when running with python-2.3
perf/.gitignore | 2 +
perf/create_synthetic_repo.py | 61 +++++++++
perf/find_patchbomb.py | 31 +++++
perf/perftest.py | 96 ++++++++++++++
perf/setup.sh | 52 ++++++++
setup.cfg | 2 +-
setup.py | 4 +-
stgit/commands/edit.py | 2 +-
stgit/commands/goto.py | 2 +
stgit/commands/uncommit.py | 6 +-
stgit/lib/git.py | 274 +++++++++++++++++++++++++++++++++--------
stgit/lib/transaction.py | 61 +++++++--
stgit/main.py | 10 ++-
stgit/out.py | 11 +-
stgit/run.py | 59 +++++++--
t/t1206-push-hidden.sh | 28 ++++
t/t1300-uncommit.sh | 13 ++-
t/t1303-commit.sh | 20 +++
t/t1701-goto-hidden.sh | 23 ++++
t/t2701-refresh-p.sh | 46 +++++++
t/t2900-rename.sh | 7 +
t/t3300-edit.sh | 16 ++-
22 files changed, 731 insertions(+), 95 deletions(-)
create mode 100644 perf/.gitignore
create mode 100644 perf/create_synthetic_repo.py
create mode 100644 perf/find_patchbomb.py
create mode 100644 perf/perftest.py
create mode 100644 perf/setup.sh
create mode 100755 t/t1206-push-hidden.sh
create mode 100755 t/t1303-commit.sh
create mode 100755 t/t1701-goto-hidden.sh
create mode 100755 t/t2701-refresh-p.sh
-+-
The following changes since commit 36a06e0194e013552499677e431e528ecb2faee9:
Karl Hasselström (1):
Global performance logging
are available in the git repository at:
git://repo.or.cz/stgit/kha.git experimental
Karl Hasselström (16):
Write to a stack log when stack is modified
New command: stg reset
Log conflicts separately
Log conflicts separately for all commands
Add a --hard flag to stg reset
Don't write a log entry if there were no changes
Move stack reset function to a shared location
New command: stg undo
New command: stg redo
Log and undo external modifications
Make "stg log" show stack log instead of patch log
Convert "stg refresh" to the new infrastructure
New refresh tests
Remove --undo flags from stg commands and docs
Refactor stgit.commands.edit
Implement "stg refresh --edit" again
Documentation/tutorial.txt | 4 +-
TODO | 2 -
stgit/commands/branch.py | 19 +-
stgit/commands/clone.py | 2 +-
stgit/commands/coalesce.py | 2 +-
stgit/commands/common.py | 18 ++-
stgit/commands/diff.py | 6 +-
stgit/commands/edit.py | 82 +------
stgit/commands/export.py | 2 +-
stgit/commands/files.py | 6 +-
stgit/commands/float.py | 2 +-
stgit/commands/fold.py | 2 +-
stgit/commands/goto.py | 3 +-
stgit/commands/hide.py | 2 +-
stgit/commands/id.py | 2 +-
stgit/commands/imprt.py | 4 +-
stgit/commands/log.py | 169 +++++----------
stgit/commands/mail.py | 8 +-
stgit/commands/new.py | 3 +-
stgit/commands/patches.py | 2 +-
stgit/commands/pick.py | 2 +-
stgit/commands/pop.py | 4 +-
stgit/commands/pull.py | 2 +-
stgit/commands/push.py | 31 +--
stgit/commands/rebase.py | 4 +-
stgit/commands/redo.py | 52 ++++
stgit/commands/refresh.py | 338 ++++++++++++++++++---------
stgit/commands/rename.py | 2 +-
stgit/commands/repair.py | 11 +-
stgit/commands/reset.py | 57 +++++
stgit/commands/resolved.py | 2 +-
stgit/commands/show.py | 2 +-
stgit/commands/sink.py | 2 +-
stgit/commands/status.py | 3 +-
stgit/commands/sync.py | 26 +--
stgit/commands/undo.py | 49 ++++
stgit/commands/unhide.py | 2 +-
stgit/git.py | 4 -
stgit/lib/edit.py | 99 ++++++++
stgit/lib/git.py | 74 ++++++-
stgit/lib/log.py | 524 ++++++++++++++++++++++++++++++++++++++++++
stgit/lib/stack.py | 25 ++
stgit/lib/transaction.py | 125 +++++++----
stgit/main.py | 8 +
stgit/stack.py | 45 +----
stgit/utils.py | 18 +-
t/t1200-push-modified.sh | 2 +-
t/t1201-pull-trailing.sh | 2 +-
t/t1202-push-undo.sh | 8 +-
t/t1400-patch-history.sh | 103 --------
t/t2300-refresh-subdir.sh | 29 +++-
t/t2701-refresh-p.sh | 2 +-
t/t3100-reset.sh | 160 +++++++++++++
t/t3101-reset-hard.sh | 56 +++++
t/t3102-undo.sh | 86 +++++++
t/t3103-undo-hard.sh | 56 +++++
t/t3104-redo.sh | 122 ++++++++++
t/t3105-undo-external-mod.sh | 68 ++++++
t/t3300-edit.sh | 4 +-
59 files changed, 1936 insertions(+), 613 deletions(-)
create mode 100644 stgit/commands/redo.py
create mode 100644 stgit/commands/reset.py
create mode 100644 stgit/commands/undo.py
create mode 100644 stgit/lib/edit.py
create mode 100644 stgit/lib/log.py
delete mode 100755 t/t1400-patch-history.sh
create mode 100755 t/t3100-reset.sh
create mode 100755 t/t3101-reset-hard.sh
create mode 100755 t/t3102-undo.sh
create mode 100755 t/t3103-undo-hard.sh
create mode 100755 t/t3104-redo.sh
create mode 100755 t/t3105-undo-external-mod.sh
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: StGit: kha/{stable,safe,experimental} updated
2008-07-25 1:39 StGit: kha/{stable,safe,experimental} updated Karl Hasselström
@ 2008-07-27 8:44 ` Catalin Marinas
2008-08-01 10:22 ` Karl Hasselström
0 siblings, 1 reply; 12+ messages in thread
From: Catalin Marinas @ 2008-07-27 8:44 UTC (permalink / raw)
To: Karl Hasselström; +Cc: git, Samuel Tardieu
2008/7/25 Karl Hasselström <kha@treskal.com>:
> The big update since last time is support (in kha/experimental) for
> hidden patches in the new-infrastructure commands and stack log.
>
> Unless more problems are uncovered, I'll soon move all patches in
> experimental to safe (which means I'll be recommending that Catalin
> merge them).
I'll have a look at the new stack log format (my main worry) this week
but the other patches look OK.
I merged the safe and stable branches.
Thanks.
--
Catalin
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: StGit: kha/{stable,safe,experimental} updated
2008-07-27 8:44 ` Catalin Marinas
@ 2008-08-01 10:22 ` Karl Hasselström
2008-08-05 21:33 ` Catalin Marinas
0 siblings, 1 reply; 12+ messages in thread
From: Karl Hasselström @ 2008-08-01 10:22 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git, Samuel Tardieu
On 2008-07-27 09:44:31 +0100, Catalin Marinas wrote:
> 2008/7/25 Karl Hasselström <kha@treskal.com>:
>
> > The big update since last time is support (in kha/experimental) for
> > hidden patches in the new-infrastructure commands and stack log.
>
> I'll have a look at the new stack log format (my main worry) this
> week but the other patches look OK.
Heh. It's _always_ your main worry. But rightly so, since mistakes
could be costly. Thanks for spending time on this with me.
I made one change apart from adding the hidden patches: use the same
tree for both the full and simplified logs. It's no more costly to
write, and made the parsing substantially simpler.
> I merged the safe and stable branches.
Thanks.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: StGit: kha/{stable,safe,experimental} updated
2008-08-01 10:22 ` Karl Hasselström
@ 2008-08-05 21:33 ` Catalin Marinas
2008-08-06 10:18 ` Karl Hasselström
0 siblings, 1 reply; 12+ messages in thread
From: Catalin Marinas @ 2008-08-05 21:33 UTC (permalink / raw)
To: Karl Hasselström; +Cc: git, Samuel Tardieu
2008/8/1 Karl Hasselström <kha@treskal.com>:
> On 2008-07-27 09:44:31 +0100, Catalin Marinas wrote:
>
>> 2008/7/25 Karl Hasselström <kha@treskal.com>:
>>
>> > The big update since last time is support (in kha/experimental) for
>> > hidden patches in the new-infrastructure commands and stack log.
>>
>> I'll have a look at the new stack log format (my main worry) this
>> week but the other patches look OK.
>
> Heh. It's _always_ your main worry. But rightly so, since mistakes
> could be costly. Thanks for spending time on this with me.
I'm usually worried about performance but will give it a try with a
Linux kernel and real patches. Have you done any tests to compare it
with my master branch?
Would we even need to prune the stack history? It might get pretty
large after about 1-2 years of usage.
--
Catalin
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: StGit: kha/{stable,safe,experimental} updated
2008-08-05 21:33 ` Catalin Marinas
@ 2008-08-06 10:18 ` Karl Hasselström
0 siblings, 0 replies; 12+ messages in thread
From: Karl Hasselström @ 2008-08-06 10:18 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git, Samuel Tardieu
On 2008-08-05 22:33:57 +0100, Catalin Marinas wrote:
> 2008/8/1 Karl Hasselström <kha@treskal.com>:
>
> > Heh. It's _always_ your main worry. But rightly so, since mistakes
> > could be costly. Thanks for spending time on this with me.
>
> I'm usually worried about performance but will give it a try with a
> Linux kernel and real patches. Have you done any tests to compare it
> with my master branch?
Yes. I posted the benchmark results a while back -- as I recall, the
performance was about the same for large uncommit and rebase
operations.
Also, I'm currently investigating some possible optimizations. Will
post new bechmarks afterwards, if I get something working.
> Would we even need to prune the stack history? It might get pretty
> large after about 1-2 years of usage.
Yes, it's growing without bound, so eventually one would have to prune
it.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2008-08-06 9:57 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-25 1:39 StGit: kha/{stable,safe,experimental} updated Karl Hasselström
2008-07-27 8:44 ` Catalin Marinas
2008-08-01 10:22 ` Karl Hasselström
2008-08-05 21:33 ` Catalin Marinas
2008-08-06 10:18 ` Karl Hasselström
-- strict thread matches above, loose matches on Subject: below --
2008-07-15 19:58 Karl Hasselström
2008-04-13 19:11 Karl Hasselström
2008-04-14 6:44 ` Samuel Tardieu
2008-04-14 7:03 ` Karl Hasselström
2008-04-14 8:11 ` Karl Hasselström
2008-04-14 20:08 ` Karl Hasselström
2008-04-15 0:26 ` Karl Hasselström
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).