* [StGit PATCH 8/8] Remove the --force flag to "stg rebase" and "stg pull"
From: Karl Hasselström @ 2007-10-07 23:18 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
In-Reply-To: <20071007231446.12626.14259.stgit@yoghurt>
Instead, always behave as if the force flag was given; that is, don't
check if rebasing would leave a dangling commit behind. Reasons:
* The check for this was very strict and caused a lot of false
positives.
* Everything is recorded in the reflog, so we can't actually lose
commits.
This fixes bug 9181.
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
stgit/commands/common.py | 9 +--------
stgit/commands/pull.py | 5 +----
stgit/commands/rebase.py | 5 +----
stgit/stack.py | 1 -
t/t2100-pull-policy-fetch.sh | 14 --------------
t/t2102-pull-policy-rebase.sh | 24 ------------------------
6 files changed, 3 insertions(+), 55 deletions(-)
diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 27a616f..9815400 100644
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -318,14 +318,7 @@ def address_or_alias(addr_str):
for addr in addr_str.split(',')]
return ', '.join([addr for addr in addr_list if addr])
-def prepare_rebase(force=None):
- if not force:
- # Be sure we won't loose results of stg-(un)commit by error.
- # Do not require an existing orig-base for compatibility with 0.12 and earlier.
- origbase = crt_series._get_field('orig-base')
- if origbase and crt_series.get_base() != origbase:
- raise CmdException, 'Rebasing would possibly lose data'
-
+def prepare_rebase():
# pop all patches
applied = crt_series.get_applied()
if len(applied) > 0:
diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 070db99..237bdd9 100644
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -43,9 +43,6 @@ options = [make_option('-n', '--nopush',
action = 'store_true'),
make_option('-m', '--merged',
help = 'check for patches merged upstream',
- action = 'store_true'),
- make_option('--force',
- help = 'force rebase even if the stack based was moved by (un)commits',
action = 'store_true')]
def func(parser, options, args):
@@ -81,7 +78,7 @@ def func(parser, options, args):
if policy not in ['pull', 'fetch-rebase', 'rebase']:
raise GitConfigException, 'Unsupported pull-policy "%s"' % policy
- applied = prepare_rebase(force=options.force)
+ applied = prepare_rebase()
# pull the remote changes
if policy == 'pull':
diff --git a/stgit/commands/rebase.py b/stgit/commands/rebase.py
index c68f8e7..513729a 100644
--- a/stgit/commands/rebase.py
+++ b/stgit/commands/rebase.py
@@ -34,9 +34,6 @@ options = [make_option('-n', '--nopush',
action = 'store_true'),
make_option('-m', '--merged',
help = 'check for patches merged upstream',
- action = 'store_true'),
- make_option('--force',
- help = 'force rebase even if the stack based was moved by (un)commits',
action = 'store_true')]
def func(parser, options, args):
@@ -56,7 +53,7 @@ def func(parser, options, args):
if git_id(args[0]) == None:
raise GitException, 'Unknown revision: %s' % args[0]
- applied = prepare_rebase(force=options.force)
+ applied = prepare_rebase()
rebase(args[0])
post_rebase(applied, options.nopush, options.merged)
diff --git a/stgit/stack.py b/stgit/stack.py
index bdb4e38..94856b8 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -623,7 +623,6 @@ class Series(PatchSet):
self.create_empty_field('applied')
self.create_empty_field('unapplied')
- self._set_field('orig-base', git.get_head())
config.set(self.format_version_key(), str(FORMAT_VERSION))
diff --git a/t/t2100-pull-policy-fetch.sh b/t/t2100-pull-policy-fetch.sh
index 1f50069..28901b1 100755
--- a/t/t2100-pull-policy-fetch.sh
+++ b/t/t2100-pull-policy-fetch.sh
@@ -55,18 +55,4 @@ test_expect_success \
test `wc -l <clone/file2` = 3
'
-# this one exercises the guard against commits
-# (use a new file to avoid mistaking a conflict for a success)
-test_expect_success \
- 'New upstream commit and commit a patch in clone' \
- '
- (cd upstream && stg new u2 -m u2 &&
- echo a > file3 && stg add file3 && stg refresh) &&
- (cd clone && stg commit && stg new c2 -m c2 &&
- echo a >> file && stg refresh)
- '
-test_expect_success \
- 'Try to and commit a patch in clone' \
- '(cd clone && ! stg pull)'
-
test_done
diff --git a/t/t2102-pull-policy-rebase.sh b/t/t2102-pull-policy-rebase.sh
index b2fbfcf..ce2e32f 100755
--- a/t/t2102-pull-policy-rebase.sh
+++ b/t/t2102-pull-policy-rebase.sh
@@ -36,28 +36,4 @@ test_expect_success \
test `wc -l <file2` = 2
'
-# this one exercises the guard against commits
-# (use a new file to avoid mistaking a conflict for a success)
-test_expect_success \
- 'New commit in parent and commit a patch in stack' \
- '
- stg branch parent && stg new u2 -m u2 &&
- echo c > file3 && stg add file3 && stg refresh &&
- stg branch stack && stg commit && stg new c2 -m c2 &&
- echo a >> file && stg refresh
- '
-test_expect_success \
- 'Try to pull/rebase now that stack base has moved' \
- '! stg pull'
-
-test_expect_success \
- 'Force the pull/rebase, but do not push yet' \
- 'stg pull --force --nopush'
-test_expect_success \
- '...check we lost the committed patch' \
- '! test -e file'
-test_expect_success \
- '...and check we get a conflict while pushing' \
- '! stg push'
-
test_done
^ permalink raw reply related
* Re: Trying to use git-filter-branch to compress history by removing large, obsolete binary files
From: Johannes Schindelin @ 2007-10-07 23:19 UTC (permalink / raw)
To: Elijah Newren; +Cc: Frank Lichtenheld, git
In-Reply-To: <51419b2c0710071500x318ee734n9db6ca9e6daa3196@mail.gmail.com>
Hi,
On Sun, 7 Oct 2007, Elijah Newren wrote:
> So...how do I fix the reflog, and then repack to have a pack under 11MB
> in size?
Just clone it. The clone will be much smaller.
Ciao,
Dscho
^ permalink raw reply
* Re: Trying to use git-filter-branch to compress history by removing large, obsolete binary files
From: Elijah Newren @ 2007-10-07 23:24 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Frank Lichtenheld, git
In-Reply-To: <Pine.LNX.4.64.0710080018270.4174@racer.site>
On 10/7/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> On Sun, 7 Oct 2007, Elijah Newren wrote:
>
> > So...how do I fix the reflog, and then repack to have a pack under 11MB
> > in size?
>
> Just clone it. The clone will be much smaller.
$ git clone test test2
<snip>
$ du -hs test
11M test
$ du -hs test2
11M test2
Any other ideas?
^ permalink raw reply
* [StGit PATCH 0/5] Make push and refresh subdirectory safe
From: Karl Hasselström @ 2007-10-07 23:24 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
This series makes push and refresh safe to use from subdirectories, by
using the infrastructure of the first patch to cd to the top of the
worktree.
As stated in the commit messages, this may not be an optimal long-term
solution, but we need to fix this quick. And the infrastructure isn't
good only for cd'ing to the top of the worktree.
This series is also available from
git://repo.or.cz/stgit/kha.git safe
---
Karl Hasselström (5):
Make "stg refresh" subdirectory safe
New test: try "stg refresh" in a subdirectory
Make "stg push" subdirectory safe
New test: Try "stg push" in a subdirectory
Infrastructure for current directory handling
stgit/commands/add.py | 1 +
stgit/commands/applied.py | 1 +
stgit/commands/assimilate.py | 1 +
stgit/commands/branch.py | 1 +
stgit/commands/clean.py | 1 +
stgit/commands/clone.py | 1 +
stgit/commands/commit.py | 1 +
stgit/commands/common.py | 68 ++++++++++++++++++++++++++++++++++++++++++
stgit/commands/copy.py | 1 +
stgit/commands/delete.py | 1 +
stgit/commands/diff.py | 1 +
stgit/commands/edit.py | 1 +
stgit/commands/export.py | 1 +
stgit/commands/files.py | 1 +
stgit/commands/float.py | 1 +
stgit/commands/fold.py | 1 +
stgit/commands/goto.py | 1 +
stgit/commands/hide.py | 1 +
stgit/commands/id.py | 1 +
stgit/commands/imprt.py | 1 +
stgit/commands/init.py | 1 +
stgit/commands/log.py | 1 +
stgit/commands/mail.py | 1 +
stgit/commands/new.py | 1 +
stgit/commands/patches.py | 1 +
stgit/commands/pick.py | 1 +
stgit/commands/pop.py | 1 +
stgit/commands/pull.py | 1 +
stgit/commands/push.py | 1 +
stgit/commands/rebase.py | 1 +
stgit/commands/refresh.py | 1 +
stgit/commands/rename.py | 1 +
stgit/commands/resolved.py | 1 +
stgit/commands/rm.py | 1 +
stgit/commands/series.py | 1 +
stgit/commands/show.py | 1 +
stgit/commands/sink.py | 1 +
stgit/commands/status.py | 1 +
stgit/commands/sync.py | 1 +
stgit/commands/top.py | 1 +
stgit/commands/unapplied.py | 1 +
stgit/commands/uncommit.py | 1 +
stgit/commands/unhide.py | 1 +
stgit/main.py | 2 +
t/t1205-push-subdir.sh | 55 ++++++++++++++++++++++++++++++++++
t/t2300-refresh-subdir.sh | 27 +++++++++++++++++
46 files changed, 194 insertions(+), 0 deletions(-)
create mode 100755 t/t1205-push-subdir.sh
create mode 100755 t/t2300-refresh-subdir.sh
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply
* [StGit PATCH 1/5] Infrastructure for current directory handling
From: Karl Hasselström @ 2007-10-07 23:24 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
In-Reply-To: <20071007231949.13070.49517.stgit@yoghurt>
Add infrastructure to allow commands to specify if they need a git
repository, if they need to be called from within the working tree,
and if they should cd to the root of the working tree before doing
anything else.
For now, all commands are set to just require a repository (except
"stg clone", which is set to require nothing), which means the only
thing that's added is some very light error checking. The idea is to
tighten this for commands that turn out to need it.
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
stgit/commands/add.py | 1 +
stgit/commands/applied.py | 1 +
stgit/commands/assimilate.py | 1 +
stgit/commands/branch.py | 1 +
stgit/commands/clean.py | 1 +
stgit/commands/clone.py | 1 +
stgit/commands/commit.py | 1 +
stgit/commands/common.py | 68 ++++++++++++++++++++++++++++++++++++++++++
stgit/commands/copy.py | 1 +
stgit/commands/delete.py | 1 +
stgit/commands/diff.py | 1 +
stgit/commands/edit.py | 1 +
stgit/commands/export.py | 1 +
stgit/commands/files.py | 1 +
stgit/commands/float.py | 1 +
stgit/commands/fold.py | 1 +
stgit/commands/goto.py | 1 +
stgit/commands/hide.py | 1 +
stgit/commands/id.py | 1 +
stgit/commands/imprt.py | 1 +
stgit/commands/init.py | 1 +
stgit/commands/log.py | 1 +
stgit/commands/mail.py | 1 +
stgit/commands/new.py | 1 +
stgit/commands/patches.py | 1 +
stgit/commands/pick.py | 1 +
stgit/commands/pop.py | 1 +
stgit/commands/pull.py | 1 +
stgit/commands/push.py | 1 +
stgit/commands/rebase.py | 1 +
stgit/commands/refresh.py | 1 +
stgit/commands/rename.py | 1 +
stgit/commands/resolved.py | 1 +
stgit/commands/rm.py | 1 +
stgit/commands/series.py | 1 +
stgit/commands/show.py | 1 +
stgit/commands/sink.py | 1 +
stgit/commands/status.py | 1 +
stgit/commands/sync.py | 1 +
stgit/commands/top.py | 1 +
stgit/commands/unapplied.py | 1 +
stgit/commands/uncommit.py | 1 +
stgit/commands/unhide.py | 1 +
stgit/main.py | 2 +
44 files changed, 112 insertions(+), 0 deletions(-)
diff --git a/stgit/commands/add.py b/stgit/commands/add.py
index fc9c5a7..264ab9f 100644
--- a/stgit/commands/add.py
+++ b/stgit/commands/add.py
@@ -31,6 +31,7 @@ Add the files or directories passed as arguments to the
repository. When a directory name is given, all the files and
subdirectories are recursively added."""
+directory = DirectoryHasRepository()
options = []
diff --git a/stgit/commands/applied.py b/stgit/commands/applied.py
index b9bb716..45d0926 100644
--- a/stgit/commands/applied.py
+++ b/stgit/commands/applied.py
@@ -32,6 +32,7 @@ List the patches from the series which were already pushed onto the
stack. They are listed in the order in which they were pushed, the
last one being the current (topmost) patch."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
make_option('-c', '--count',
diff --git a/stgit/commands/assimilate.py b/stgit/commands/assimilate.py
index 43672fd..db8a95c 100644
--- a/stgit/commands/assimilate.py
+++ b/stgit/commands/assimilate.py
@@ -53,6 +53,7 @@ Note that these are "inconsistencies", not "errors"; furthermore,
with the way "assimilate" handles them, you have no reason to avoid
causing them in the first place if that is convenient for you."""
+directory = DirectoryHasRepository()
options = []
class Commit(object):
diff --git a/stgit/commands/branch.py b/stgit/commands/branch.py
index c16fc69..6e0a6d8 100644
--- a/stgit/commands/branch.py
+++ b/stgit/commands/branch.py
@@ -40,6 +40,7 @@ When displaying the branches, the names can be prefixed with
If not given any options, switch to the named branch."""
+directory = DirectoryHasRepository()
options = [make_option('-c', '--create',
help = 'create a new development branch',
action = 'store_true'),
diff --git a/stgit/commands/clean.py b/stgit/commands/clean.py
index 2e3b202..d8bbe71 100644
--- a/stgit/commands/clean.py
+++ b/stgit/commands/clean.py
@@ -31,6 +31,7 @@ Delete the empty patches in the whole series or only those applied or
unapplied. A patch is considered empty if the two commit objects
representing its boundaries refer to the same tree object."""
+directory = DirectoryHasRepository()
options = [make_option('-a', '--applied',
help = 'delete the empty applied patches',
action = 'store_true'),
diff --git a/stgit/commands/clone.py b/stgit/commands/clone.py
index 15139c8..a150010 100644
--- a/stgit/commands/clone.py
+++ b/stgit/commands/clone.py
@@ -29,6 +29,7 @@ usage = """%prog [options] <repository> <dir>
Clone a GIT <repository> into the local <dir> and initialise the
patch stack."""
+directory = DirectoryAnywhere()
options = []
diff --git a/stgit/commands/commit.py b/stgit/commands/commit.py
index 0b76c56..2b45c0d 100644
--- a/stgit/commands/commit.py
+++ b/stgit/commands/commit.py
@@ -32,6 +32,7 @@ remove them from the series while advancing the base.
Use this command only if you want to permanently store the applied
patches and no longer manage them with StGIT."""
+directory = DirectoryHasRepository()
options = []
diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 9815400..27ef465 100644
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -24,6 +24,7 @@ from optparse import OptionParser, make_option
from stgit.exception import *
from stgit.utils import *
from stgit.out import *
+from stgit.run import *
from stgit import stack, git, basedir
from stgit.config import config, file_extensions
@@ -480,3 +481,70 @@ def parse_patch(fobj):
# we don't yet have an agreed place for the creation date.
# Just return None
return (descr, authname, authemail, authdate, diff)
+
+def readonly_constant_property(f):
+ """Decorator that converts a function that computes a value to an
+ attribute that returns the value. The value is computed only once,
+ the first time it is accessed."""
+ def new_f(self):
+ n = '__' + f.__name__
+ if not hasattr(self, n):
+ setattr(self, n, f(self))
+ return getattr(self, n)
+ return property(new_f)
+
+class DirectoryException(StgException):
+ pass
+
+class _Directory(object):
+ @readonly_constant_property
+ def git_dir(self):
+ try:
+ return Run('git-rev-parse', '--git-dir'
+ ).discard_stderr().output_one_line()
+ except RunException:
+ raise DirectoryException('No git repository found')
+ @readonly_constant_property
+ def __topdir_path(self):
+ try:
+ lines = Run('git-rev-parse', '--show-cdup'
+ ).discard_stderr().output_lines()
+ if len(lines) == 0:
+ return '.'
+ elif len(lines) == 1:
+ return lines[0]
+ else:
+ raise RunException('Too much output')
+ except RunException:
+ raise DirectoryException('No git repository found')
+ @readonly_constant_property
+ def is_inside_git_dir(self):
+ return { 'true': True, 'false': False
+ }[Run('git-rev-parse', '--is-inside-git-dir'
+ ).output_one_line()]
+ @readonly_constant_property
+ def is_inside_worktree(self):
+ return { 'true': True, 'false': False
+ }[Run('git-rev-parse', '--is-inside-work-tree'
+ ).output_one_line()]
+ def cd_to_topdir(self):
+ os.chdir(self.__topdir_path)
+
+class DirectoryAnywhere(_Directory):
+ def setup(self):
+ pass
+
+class DirectoryHasRepository(_Directory):
+ def setup(self):
+ self.git_dir # might throw an exception
+
+class DirectoryInWorktree(DirectoryHasRepository):
+ def setup(self):
+ DirectoryHasRepository.setup(self)
+ if not self.is_inside_worktree:
+ raise DirectoryException('Not inside a git worktree')
+
+class DirectoryGotoToplevel(DirectoryInWorktree):
+ def setup(self):
+ DirectoryInWorktree.setup(self)
+ self.cd_to_topdir()
diff --git a/stgit/commands/copy.py b/stgit/commands/copy.py
index 76e3bf9..e94dd66 100644
--- a/stgit/commands/copy.py
+++ b/stgit/commands/copy.py
@@ -30,6 +30,7 @@ usage = """%prog [options] [<file/dir> <newname> | <files/dirs...> <dir>]
Copy of the files and dirs passed as arguments under another name or
location inside the same repository."""
+directory = DirectoryHasRepository()
options = []
def func(parser, options, args):
diff --git a/stgit/commands/delete.py b/stgit/commands/delete.py
index 2121015..8462857 100644
--- a/stgit/commands/delete.py
+++ b/stgit/commands/delete.py
@@ -36,6 +36,7 @@ patches are deleted, they are popped from the stack.
Note that the 'delete' operation is irreversible."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one')]
diff --git a/stgit/commands/diff.py b/stgit/commands/diff.py
index aeca4ab..f3b0ea2 100644
--- a/stgit/commands/diff.py
+++ b/stgit/commands/diff.py
@@ -42,6 +42,7 @@ rev = '([patch][//[bottom | top]]) | <tree-ish> | base'
If neither bottom nor top are given but a '//' is present, the command
shows the specified patch (defaulting to the current one)."""
+directory = DirectoryHasRepository()
options = [make_option('-r', '--range',
metavar = 'rev1[..[rev2]]', dest = 'revs',
help = 'show the diff between revisions'),
diff --git a/stgit/commands/edit.py b/stgit/commands/edit.py
index 223c628..02970bc 100644
--- a/stgit/commands/edit.py
+++ b/stgit/commands/edit.py
@@ -57,6 +57,7 @@ rejected patch is stored in the .stgit-failed.patch file (and also in
these files using the '--file' and '--diff' options.
"""
+directory = DirectoryHasRepository()
options = [make_option('-d', '--diff',
help = 'edit the patch diff',
action = 'store_true'),
diff --git a/stgit/commands/export.py b/stgit/commands/export.py
index 62be394..d8ce86d 100644
--- a/stgit/commands/export.py
+++ b/stgit/commands/export.py
@@ -49,6 +49,7 @@ file:
%(commemail)s - committer's e-mail
"""
+directory = DirectoryHasRepository()
options = [make_option('-d', '--dir',
help = 'export patches to DIR instead of the default'),
make_option('-p', '--patch',
diff --git a/stgit/commands/files.py b/stgit/commands/files.py
index 1a10023..07cc955 100644
--- a/stgit/commands/files.py
+++ b/stgit/commands/files.py
@@ -34,6 +34,7 @@ given patch. Note that this command doesn't show the files modified in
the working tree and not yet included in the patch by a 'refresh'
command. Use the 'diff' or 'status' commands for these files."""
+directory = DirectoryHasRepository()
options = [make_option('-s', '--stat',
help = 'show the diff stat',
action = 'store_true'),
diff --git a/stgit/commands/float.py b/stgit/commands/float.py
index 0e32f6b..d5299fb 100644
--- a/stgit/commands/float.py
+++ b/stgit/commands/float.py
@@ -31,6 +31,7 @@ necessary pop and push operations will be performed to accomplish
this. The '--series' option can be used to rearrange the (top) patches
as specified by the given series file (or the standard input)."""
+directory = DirectoryHasRepository()
options = [make_option('-s', '--series',
help = 'rearrange according to a series file',
action = 'store_true')]
diff --git a/stgit/commands/fold.py b/stgit/commands/fold.py
index d97185e..6e43101 100644
--- a/stgit/commands/fold.py
+++ b/stgit/commands/fold.py
@@ -34,6 +34,7 @@ performed with the current top. With the --base option, the patch is
applied onto the specified base and a three-way merged is performed
with the current top."""
+directory = DirectoryHasRepository()
options = [make_option('-t', '--threeway',
help = 'perform a three-way merge with the current patch',
action = 'store_true'),
diff --git a/stgit/commands/goto.py b/stgit/commands/goto.py
index a4427fa..9e008a9 100644
--- a/stgit/commands/goto.py
+++ b/stgit/commands/goto.py
@@ -31,6 +31,7 @@ line becomes current. This is a shortcut for the 'push --to' or 'pop
--to' commands. There is no '--undo' option for 'goto'. Use the 'push'
command for this."""
+directory = DirectoryHasRepository()
options = [make_option('-k', '--keep',
help = 'keep the local changes when popping patches',
action = 'store_true')]
diff --git a/stgit/commands/hide.py b/stgit/commands/hide.py
index de19c19..1a38907 100644
--- a/stgit/commands/hide.py
+++ b/stgit/commands/hide.py
@@ -30,6 +30,7 @@ usage = """%prog [options] <patch-range>
Hide a range of unapplied patches so that they are no longer shown in
the plain 'series' command output."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one')]
diff --git a/stgit/commands/id.py b/stgit/commands/id.py
index f72d2f3..3e28f2f 100644
--- a/stgit/commands/id.py
+++ b/stgit/commands/id.py
@@ -33,6 +33,7 @@ the standard GIT id's like heads and tags, this command also accepts
'top' or 'bottom' are passed and <patch> is a valid patch name, 'top'
will be used by default."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one')]
diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 717f373..045f185 100644
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -44,6 +44,7 @@ stack.
The patch description has to be separated from the data with a '---'
line."""
+directory = DirectoryHasRepository()
options = [make_option('-m', '--mail',
help = 'import the patch from a standard e-mail file',
action = 'store_true'),
diff --git a/stgit/commands/init.py b/stgit/commands/init.py
index 46562d0..475a4ce 100644
--- a/stgit/commands/init.py
+++ b/stgit/commands/init.py
@@ -31,6 +31,7 @@ Initialise the current GIT branch to be used as an StGIT stack. Note
that you must already be in a GIT repository and .git/HEAD must point
to a valid file in refs/heads/."""
+directory = DirectoryHasRepository()
options = []
diff --git a/stgit/commands/log.py b/stgit/commands/log.py
index 4d6b022..f8337f9 100644
--- a/stgit/commands/log.py
+++ b/stgit/commands/log.py
@@ -43,6 +43,7 @@ represent the changes to the entire base of the current
patch. Conflicts reset the patch content and a subsequent 'refresh'
will show the entire patch."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
make_option('-p', '--patch',
diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py
index c32894e..4a4158a 100644
--- a/stgit/commands/mail.py
+++ b/stgit/commands/mail.py
@@ -88,6 +88,7 @@ the following:
%(prefix)s - 'prefix ' string passed on the command line
%(shortdescr)s - the first line of the patch description"""
+directory = DirectoryHasRepository()
options = [make_option('-a', '--all',
help = 'e-mail all the applied patches',
action = 'store_true'),
diff --git a/stgit/commands/new.py b/stgit/commands/new.py
index 59671ab..ccc8141 100644
--- a/stgit/commands/new.py
+++ b/stgit/commands/new.py
@@ -38,6 +38,7 @@ needed for this.
If no name is given for the new patch, one is generated from the first
line of the commit message."""
+directory = DirectoryHasRepository()
options = [make_option('-m', '--message',
help = 'use MESSAGE as the patch description'),
make_option('-s', '--showpatch',
diff --git a/stgit/commands/patches.py b/stgit/commands/patches.py
index fb65b62..0b618fe 100644
--- a/stgit/commands/patches.py
+++ b/stgit/commands/patches.py
@@ -33,6 +33,7 @@ it shows the patches affected by the local tree modifications. The
'--diff' option also lists the patch log and the diff for the given
files."""
+directory = DirectoryHasRepository()
options = [make_option('-d', '--diff',
help = 'show the diff for the given files',
action = 'store_true'),
diff --git a/stgit/commands/pick.py b/stgit/commands/pick.py
index 1c3ef11..3acec32 100644
--- a/stgit/commands/pick.py
+++ b/stgit/commands/pick.py
@@ -34,6 +34,7 @@ the name of the current patch. It can be overridden with the '--name'
option. A commit object can be reverted with the '--reverse'
option. The log and author information are those of the commit object."""
+directory = DirectoryHasRepository()
options = [make_option('-n', '--name',
help = 'use NAME as the patch name'),
make_option('-r', '--reverse',
diff --git a/stgit/commands/pop.py b/stgit/commands/pop.py
index 0dfaad9..a1d73e4 100644
--- a/stgit/commands/pop.py
+++ b/stgit/commands/pop.py
@@ -36,6 +36,7 @@ patches passed on the command line are popped from the stack. Some of
the push operations may fail because of conflicts (push --undo would
revert the last push operation)."""
+directory = DirectoryHasRepository()
options = [make_option('-a', '--all',
help = 'pop all the applied patches',
action = 'store_true'),
diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 237bdd9..5fcf2cc 100644
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -38,6 +38,7 @@ resolved and the patch pushed again.
Check the 'git fetch' documentation for the <repository> format."""
+directory = DirectoryHasRepository()
options = [make_option('-n', '--nopush',
help = 'do not push the patches back after pulling',
action = 'store_true'),
diff --git a/stgit/commands/push.py b/stgit/commands/push.py
index 53cdb8f..b91bc5e 100644
--- a/stgit/commands/push.py
+++ b/stgit/commands/push.py
@@ -39,6 +39,7 @@ command run.
The command also notifies when the patch becomes empty (fully merged
upstream) or is modified (three-way merged) by the 'push' operation."""
+directory = DirectoryHasRepository()
options = [make_option('-a', '--all',
help = 'push all the unapplied patches',
action = 'store_true'),
diff --git a/stgit/commands/rebase.py b/stgit/commands/rebase.py
index 513729a..bbb3e12 100644
--- a/stgit/commands/rebase.py
+++ b/stgit/commands/rebase.py
@@ -29,6 +29,7 @@ usage = """%prog [options] <new-base-id>
Pop all patches from current stack, move the stack base to the given
<new-base-id> and push the patches back."""
+directory = DirectoryHasRepository()
options = [make_option('-n', '--nopush',
help = 'do not push the patches back after rebasing',
action = 'store_true'),
diff --git a/stgit/commands/refresh.py b/stgit/commands/refresh.py
index 241f065..b283892 100644
--- a/stgit/commands/refresh.py
+++ b/stgit/commands/refresh.py
@@ -37,6 +37,7 @@ options. The '--force' option is useful when a commit object was
created with a different tool but the changes need to be included in
the current patch."""
+directory = DirectoryHasRepository()
options = [make_option('-f', '--force',
help = 'force the refresh even if HEAD and '\
'top differ',
diff --git a/stgit/commands/rename.py b/stgit/commands/rename.py
index 2830e72..e2b0fa4 100644
--- a/stgit/commands/rename.py
+++ b/stgit/commands/rename.py
@@ -29,6 +29,7 @@ usage = """%prog [options] <oldpatch> <newpatch>
Rename <oldpatch> into <newpatch> in a series."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one')]
diff --git a/stgit/commands/resolved.py b/stgit/commands/resolved.py
index 1130641..c2ef678 100644
--- a/stgit/commands/resolved.py
+++ b/stgit/commands/resolved.py
@@ -34,6 +34,7 @@ Mark a merge conflict as resolved. The conflicts can be seen with the
'C'. This command also removes any <file>.{ancestor,current,patched}
files."""
+directory = DirectoryHasRepository()
options = [make_option('-a', '--all',
help = 'mark all conflicts as solved',
action = 'store_true'),
diff --git a/stgit/commands/rm.py b/stgit/commands/rm.py
index 91908a1..59d098b 100644
--- a/stgit/commands/rm.py
+++ b/stgit/commands/rm.py
@@ -30,6 +30,7 @@ usage = """%prog [options] <files...>
Remove given files from the repository. The command doesn't remove the
working copy of the file."""
+directory = DirectoryHasRepository()
options = [make_option('-f', '--force',
help = 'force removing even if the file exists',
action = 'store_true')]
diff --git a/stgit/commands/series.py b/stgit/commands/series.py
index 00a3372..2c75876 100644
--- a/stgit/commands/series.py
+++ b/stgit/commands/series.py
@@ -34,6 +34,7 @@ range. The applied patches are prefixed with a '+', the unapplied ones
with a '-' and the hidden ones with a '!'. The current patch is
prefixed with a '>'. Empty patches are prefixed with a '0'."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
make_option('-a', '--all',
diff --git a/stgit/commands/show.py b/stgit/commands/show.py
index 45ca253..7efb4e1 100644
--- a/stgit/commands/show.py
+++ b/stgit/commands/show.py
@@ -30,6 +30,7 @@ Show the commit log and the diff corresponding to the given
patches. The output is similar to that generated by the 'git show'
command."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
make_option('-a', '--applied',
diff --git a/stgit/commands/sink.py b/stgit/commands/sink.py
index 2a18ebc..737dde0 100644
--- a/stgit/commands/sink.py
+++ b/stgit/commands/sink.py
@@ -32,6 +32,7 @@ push the specified <patches> (the current patch by default), and
then push back into place the formerly-applied patches (unless -n
is also given)."""
+directory = DirectoryHasRepository()
options = [make_option('-n', '--nopush',
help = 'do not push the patches back after sinking',
action = 'store_true'),
diff --git a/stgit/commands/status.py b/stgit/commands/status.py
index b2835ab..a688f7e 100644
--- a/stgit/commands/status.py
+++ b/stgit/commands/status.py
@@ -40,6 +40,7 @@ under revision control. The files are prefixed as follows:
A 'refresh' command clears the status of the modified, new and deleted
files."""
+directory = DirectoryHasRepository()
options = [make_option('-m', '--modified',
help = 'show modified files only',
action = 'store_true'),
diff --git a/stgit/commands/sync.py b/stgit/commands/sync.py
index 580b5bd..8a31c29 100644
--- a/stgit/commands/sync.py
+++ b/stgit/commands/sync.py
@@ -36,6 +36,7 @@ in the series must apply cleanly.
The sync operation can be reverted for individual patches with --undo."""
+directory = DirectoryHasRepository()
options = [make_option('-a', '--all',
help = 'synchronise all the patches',
action = 'store_true'),
diff --git a/stgit/commands/top.py b/stgit/commands/top.py
index 1a9267a..e7cb275 100644
--- a/stgit/commands/top.py
+++ b/stgit/commands/top.py
@@ -30,6 +30,7 @@ usage = """%prog [options]
Print the name of the current (topmost) patch."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one')]
diff --git a/stgit/commands/unapplied.py b/stgit/commands/unapplied.py
index c6408a3..d5bb43e 100644
--- a/stgit/commands/unapplied.py
+++ b/stgit/commands/unapplied.py
@@ -31,6 +31,7 @@ usage = """%prog [options]
List the patches from the series which are not pushed onto the stack.
They are listed in the reverse order in which they were popped."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
make_option('-c', '--count',
diff --git a/stgit/commands/uncommit.py b/stgit/commands/uncommit.py
index c22d3ea..a23ae20 100644
--- a/stgit/commands/uncommit.py
+++ b/stgit/commands/uncommit.py
@@ -48,6 +48,7 @@ given commit should be uncommitted.
Only commits with exactly one parent can be uncommitted; in other
words, you can't uncommit a merge."""
+directory = DirectoryHasRepository()
options = [make_option('-n', '--number', type = 'int',
help = 'uncommit the specified number of commits'),
make_option('-t', '--to',
diff --git a/stgit/commands/unhide.py b/stgit/commands/unhide.py
index 0a1dcaf..665d664 100644
--- a/stgit/commands/unhide.py
+++ b/stgit/commands/unhide.py
@@ -30,6 +30,7 @@ usage = """%prog [options] <patch-range>
Unhide a hidden range of patches so that they are shown in the plain
'series' command output."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one')]
diff --git a/stgit/main.py b/stgit/main.py
index 19ba2bd..15582dd 100644
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -252,6 +252,7 @@ def main():
usage = command.usage.split('\n')[0].strip()
parser = OptionParser(usage = usage, option_list = command.options)
options, args = parser.parse_args()
+ directory = command.directory
# These modules are only used from this point onwards and do not
# need to be imported earlier
@@ -267,6 +268,7 @@ def main():
sys.exit(1)
try:
+ directory.setup()
config_setup()
# 'clone' doesn't expect an already initialised GIT tree. A Series
^ permalink raw reply related
* [StGit PATCH 2/5] New test: Try "stg push" in a subdirectory
From: Karl Hasselström @ 2007-10-07 23:24 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
In-Reply-To: <20071007231949.13070.49517.stgit@yoghurt>
This currently fails for the non-fast-forward cases.
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
t/t1205-push-subdir.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
create mode 100755 t/t1205-push-subdir.sh
diff --git a/t/t1205-push-subdir.sh b/t/t1205-push-subdir.sh
new file mode 100755
index 0000000..6502c20
--- /dev/null
+++ b/t/t1205-push-subdir.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+test_description='Test the push command from a subdirectory'
+. ./test-lib.sh
+stg init
+
+test_expect_success 'Create some patches' '
+ mkdir foo
+ for i in 0 1 2; do
+ stg new p$i -m p$i &&
+ echo x$i >> x.txt &&
+ echo y$i >> foo/y.txt &&
+ stg add x.txt foo/y.txt &&
+ stg refresh
+ done &&
+ [ "$(echo $(stg applied))" = "p0 p1 p2" ] &&
+ [ "$(echo $(stg unapplied))" = "" ]
+'
+
+test_expect_success 'Fast-forward push from a subdir' '
+ stg pop &&
+ [ "$(echo $(cat x.txt))" = "x0 x1" ] &&
+ [ "$(echo $(cat foo/y.txt))" = "y0 y1" ] &&
+ cd foo &&
+ stg push &&
+ cd .. &&
+ [ "$(echo $(cat x.txt))" = "x0 x1 x2" ] &&
+ [ "$(echo $(cat foo/y.txt))" = "y0 y1 y2" ]
+'
+
+test_expect_failure 'Modifying push from a subdir' '
+ stg pop &&
+ [ "$(echo $(cat x.txt))" = "x0 x1" ] &&
+ [ "$(echo $(cat foo/y.txt))" = "y0 y1" ] &&
+ stg new extra -m extra &&
+ echo extra >> extra.txt &&
+ stg add extra.txt &&
+ stg refresh &&
+ cd foo &&
+ stg push &&
+ cd .. &&
+ [ "$(echo $(cat x.txt))" = "x0 x1 x2" ] &&
+ [ "$(echo $(cat foo/y.txt))" = "y0 y1 y2" ]
+'
+
+test_expect_failure 'Conflicting push from subdir' '
+ stg pop p1 p2 &&
+ [ "$(echo $(cat x.txt))" = "x0" ] &&
+ [ "$(echo $(cat foo/y.txt))" = "y0" ] &&
+ cd foo &&
+ ! stg push p2 &&
+ cd .. &&
+ [ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
+'
+
+test_done
^ permalink raw reply related
* [StGit PATCH 3/5] Make "stg push" subdirectory safe
From: Karl Hasselström @ 2007-10-07 23:24 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
In-Reply-To: <20071007231949.13070.49517.stgit@yoghurt>
Make "stg push" subdirectory safe by letting it internally cd up to
the top of the worktree. This is possibly not the best long-term fix;
one could argue that the push subroutine should instead be safe to run
from a subdirectory. However, pushing from a subdirectory currently
erases the parts of a patch that doesn't touch that subdirectory, and
that has to be fixed.
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
stgit/commands/push.py | 2 +-
t/t1205-push-subdir.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/stgit/commands/push.py b/stgit/commands/push.py
index b91bc5e..4d5de26 100644
--- a/stgit/commands/push.py
+++ b/stgit/commands/push.py
@@ -39,7 +39,7 @@ command run.
The command also notifies when the patch becomes empty (fully merged
upstream) or is modified (three-way merged) by the 'push' operation."""
-directory = DirectoryHasRepository()
+directory = DirectoryGotoToplevel()
options = [make_option('-a', '--all',
help = 'push all the unapplied patches',
action = 'store_true'),
diff --git a/t/t1205-push-subdir.sh b/t/t1205-push-subdir.sh
index 6502c20..f9a84f6 100755
--- a/t/t1205-push-subdir.sh
+++ b/t/t1205-push-subdir.sh
@@ -27,7 +27,7 @@ test_expect_success 'Fast-forward push from a subdir' '
[ "$(echo $(cat foo/y.txt))" = "y0 y1 y2" ]
'
-test_expect_failure 'Modifying push from a subdir' '
+test_expect_success 'Modifying push from a subdir' '
stg pop &&
[ "$(echo $(cat x.txt))" = "x0 x1" ] &&
[ "$(echo $(cat foo/y.txt))" = "y0 y1" ] &&
@@ -42,7 +42,7 @@ test_expect_failure 'Modifying push from a subdir' '
[ "$(echo $(cat foo/y.txt))" = "y0 y1 y2" ]
'
-test_expect_failure 'Conflicting push from subdir' '
+test_expect_success 'Conflicting push from subdir' '
stg pop p1 p2 &&
[ "$(echo $(cat x.txt))" = "x0" ] &&
[ "$(echo $(cat foo/y.txt))" = "y0" ] &&
^ permalink raw reply related
* [StGit PATCH 4/5] New test: try "stg refresh" in a subdirectory
From: Karl Hasselström @ 2007-10-07 23:25 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
In-Reply-To: <20071007231949.13070.49517.stgit@yoghurt>
Currently, it doesn't work. Or rather, it does work for changes that
are already in the index, which is the case for newly added files; but
it doesn't work for changes that aren't in the index.
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
t/t2300-refresh-subdir.sh | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
create mode 100755 t/t2300-refresh-subdir.sh
diff --git a/t/t2300-refresh-subdir.sh b/t/t2300-refresh-subdir.sh
new file mode 100755
index 0000000..d1c7168
--- /dev/null
+++ b/t/t2300-refresh-subdir.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+test_description='Test the refresh command from a subdirectory'
+. ./test-lib.sh
+stg init
+
+test_expect_success 'Refresh from a subdirectory' '
+ stg new foo -m foo &&
+ echo foo >> foo.txt &&
+ mkdir bar &&
+ echo bar >> bar/bar.txt &&
+ stg add foo.txt bar/bar.txt &&
+ cd bar &&
+ stg refresh &&
+ cd .. &&
+ [ "$(stg status)" = "" ]
+'
+
+test_expect_failure 'Refresh again' '
+ echo foo2 >> foo.txt &&
+ echo bar2 >> bar/bar.txt &&
+ cd bar &&
+ stg refresh &&
+ cd .. &&
+ [ "$(stg status)" = "" ]
+'
+
+test_done
^ permalink raw reply related
* [StGit PATCH 5/5] Make "stg refresh" subdirectory safe
From: Karl Hasselström @ 2007-10-07 23:25 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
In-Reply-To: <20071007231949.13070.49517.stgit@yoghurt>
Make "stg refresh" subdirectory safe by letting it internally cd up to
the top of the worktree. This is possibly not the best long-term fix;
one could argue that the refresh subroutine should instead be safe to
run from a subdirectory. However, refreshing from a subdirectory
currently only refreshes changes that are in the index, and not
changes in the working directory, and that has to be fixed.
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
stgit/commands/refresh.py | 2 +-
t/t2300-refresh-subdir.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/stgit/commands/refresh.py b/stgit/commands/refresh.py
index b283892..f032375 100644
--- a/stgit/commands/refresh.py
+++ b/stgit/commands/refresh.py
@@ -37,7 +37,7 @@ options. The '--force' option is useful when a commit object was
created with a different tool but the changes need to be included in
the current patch."""
-directory = DirectoryHasRepository()
+directory = DirectoryGotoToplevel()
options = [make_option('-f', '--force',
help = 'force the refresh even if HEAD and '\
'top differ',
diff --git a/t/t2300-refresh-subdir.sh b/t/t2300-refresh-subdir.sh
index d1c7168..bdd27c5 100755
--- a/t/t2300-refresh-subdir.sh
+++ b/t/t2300-refresh-subdir.sh
@@ -15,7 +15,7 @@ test_expect_success 'Refresh from a subdirectory' '
[ "$(stg status)" = "" ]
'
-test_expect_failure 'Refresh again' '
+test_expect_success 'Refresh again' '
echo foo2 >> foo.txt &&
echo bar2 >> bar/bar.txt &&
cd bar &&
^ permalink raw reply related
* Re: git fetch -- double fetch
From: Johannes Schindelin @ 2007-10-07 23:25 UTC (permalink / raw)
To: Andy Whitcroft; +Cc: git
In-Reply-To: <20071007214433.GA30833@shadowen.org>
Hi,
On Sun, 7 Oct 2007, Andy Whitcroft wrote:
> On Sun, Oct 07, 2007 at 05:29:38PM +0100, Johannes Schindelin wrote:
>
> > On Sat, 6 Oct 2007, Andy Whitcroft wrote:
> >
> > > I have recently been seeing repeated fetching of some branches. I
> > > feel this has happened in at least three of my repos on three
> > > distinct projects:
> > >
> > > apw@pinky$ git fetch origin
> > > remote: Generating pack...
> > > remote: Done counting 5 objects.
> > > remote: Deltifying 5 objects...
> > > remote: 100% (5/5) done
> > > Unpacking 5 objects...
> > > remote: Total 5 (delta 0), reused 0 (delta 0)
> > > 100% (5/5) done
> > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat
> > > old..new: ce046f0..41c9dde
> > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat
> > > old..new: ce046f0..41c9dde
> >
> > What does "git config --get-all remote.origin.fetch" say?
>
> apw@pinky$ git config --get-all remote.origin.fetch
> +refs/heads/master:refs/remotes/origin/master
> +refs/heads/*:refs/remotes/origin/*
> apw@pinky$
>
> I don't think that I did anything to this config, I think that is what
> the clone setup for me.
Actually, I am quite certain that git clone does not produce the first
line; But I think that it was necessary to put in some line like that in
older git, where the first ref was the one being merged by a pull.
But as I suspected, and Daniel replied, too, your issue is that both lines
match "master".
You might want to delete the first line, and use "branch.<name>.remote"
and "branch.<name>.merge" to force pull to merge "master" instead.
In the long run, it might be a good idea to cull duplicates in git-fetch,
but for the moment I have enough other stuff to do ;-)
Ciao,
Dscho
^ permalink raw reply
* Re: Trying to use git-filter-branch to compress history by removing large, obsolete binary files
From: Johannes Schindelin @ 2007-10-07 23:28 UTC (permalink / raw)
To: Elijah Newren; +Cc: Frank Lichtenheld, git
In-Reply-To: <51419b2c0710071624v79dc02d2g35a265add50dd46d@mail.gmail.com>
Hi,
On Sun, 7 Oct 2007, Elijah Newren wrote:
> On 10/7/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
>
> > On Sun, 7 Oct 2007, Elijah Newren wrote:
> >
> > > So...how do I fix the reflog, and then repack to have a pack under
> > > 11MB in size?
> >
> > Just clone it. The clone will be much smaller.
>
> $ git clone test test2
> <snip>
> $ du -hs test
> 11M test
> $ du -hs test2
> 11M test2
>
> Any other ideas?
Yep. Maybe it is necessary to run "git gc" in test2.
Ciao,
Dscho
^ permalink raw reply
* StGit kha safe branch updated
From: Karl Hasselström @ 2007-10-07 23:29 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
These are the assimilate patches, plus the two new series I just
mailed out.
The following changes since commit 764d110156e4951ca5671a700ee2402fa3597734:
Yann Dirson (1):
Better diagnostic for wrong branch configuration.
are available in the git repository at:
git://repo.or.cz/stgit/kha.git safe
Karl Hasselström (16):
Teach "stg assimilate" to repair patch reachability
Test the new powers of "stg assimilate"
Let "stg assimilate" handle missing patches
Add --ack/--sign options to "stg new"
New test: "stg pop --keep"
Fix up the help text for "stg edit"
Don't split long and short description in "stg edit"
Make a common superclass for all StGit exceptions
Simplify debug level error checking
Discard stderr output from git-rev-parse
Remove the --force flag to "stg rebase" and "stg pull"
Infrastructure for current directory handling
New test: Try "stg push" in a subdirectory
Make "stg push" subdirectory safe
New test: try "stg refresh" in a subdirectory
Make "stg refresh" subdirectory safe
stgit/commands/add.py | 1 +
stgit/commands/applied.py | 1 +
stgit/commands/assimilate.py | 199 +++++++++++++++++++++++++++++++----------
stgit/commands/branch.py | 1 +
stgit/commands/clean.py | 1 +
stgit/commands/clone.py | 1 +
stgit/commands/commit.py | 1 +
stgit/commands/common.py | 88 +++++++++++++++---
stgit/commands/copy.py | 1 +
stgit/commands/delete.py | 1 +
stgit/commands/diff.py | 1 +
stgit/commands/edit.py | 34 ++++----
stgit/commands/export.py | 1 +
stgit/commands/files.py | 1 +
stgit/commands/float.py | 1 +
stgit/commands/fold.py | 1 +
stgit/commands/goto.py | 1 +
stgit/commands/hide.py | 1 +
stgit/commands/id.py | 1 +
stgit/commands/imprt.py | 1 +
stgit/commands/init.py | 1 +
stgit/commands/log.py | 1 +
stgit/commands/mail.py | 1 +
stgit/commands/new.py | 7 +-
stgit/commands/patches.py | 1 +
stgit/commands/pick.py | 1 +
stgit/commands/pop.py | 1 +
stgit/commands/pull.py | 6 +-
stgit/commands/push.py | 1 +
stgit/commands/rebase.py | 6 +-
stgit/commands/refresh.py | 1 +
stgit/commands/rename.py | 1 +
stgit/commands/resolved.py | 1 +
stgit/commands/rm.py | 1 +
stgit/commands/series.py | 1 +
stgit/commands/show.py | 1 +
stgit/commands/sink.py | 1 +
stgit/commands/status.py | 1 +
stgit/commands/sync.py | 1 +
stgit/commands/top.py | 1 +
stgit/commands/unapplied.py | 1 +
stgit/commands/uncommit.py | 1 +
stgit/commands/unhide.py | 1 +
stgit/config.py | 3 +-
stgit/exception.py | 3 +
stgit/git.py | 6 +-
stgit/gitmergeonefile.py | 3 +-
stgit/main.py | 17 ++---
stgit/run.py | 5 +-
stgit/stack.py | 20 +++-
stgit/utils.py | 3 +-
t/t1204-pop-keep.sh | 42 +++++++++
t/t1205-push-subdir.sh | 55 +++++++++++
t/t1301-assimilate.sh | 12 +--
t/t1302-assimilate-interop.sh | 59 ++++++++++++
t/t2100-pull-policy-fetch.sh | 14 ---
t/t2102-pull-policy-rebase.sh | 24 -----
t/t2300-refresh-subdir.sh | 27 ++++++
58 files changed, 514 insertions(+), 156 deletions(-)
create mode 100644 stgit/exception.py
create mode 100755 t/t1204-pop-keep.sh
create mode 100755 t/t1205-push-subdir.sh
create mode 100755 t/t1302-assimilate-interop.sh
create mode 100755 t/t2300-refresh-subdir.sh
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply
* Re: [PATCH] git-gui: offer a list of recent repositories on startup
From: Shawn O. Pearce @ 2007-10-07 23:30 UTC (permalink / raw)
To: Steffen Prohaska; +Cc: git, msysgit
In-Reply-To: <11917925011987-git-send-email-prohaska@zib.de>
Steffen Prohaska <prohaska@zib.de> wrote:
> If git-gui is started outside a work tree the repository
> chooser will offer a list of recently opend repositories.
> Clicking on an entry directly opens the repository.
>
> The list of recently opened repositories is stored in the
> config as gui.recentrepos. If the list grows beyond 10
> entries it will be truncated.
>
> Note, only repositories that are opened through the
> repository chooser will get added to the recent list.
> Repositories opened from the shell will not yet be added.
I think that all makes a lot of sense. Three comments below about
this patch in particular.
> I'd suggest to reduce the number of clicks needed to open or
> clone an existing directory that is not in the list of
> recent repositories. First choosing from the radiobuttons
> and then clicking next is one click to much. There are no
> options to combine. Choosing from the list should
> immediately trigger the action.
>
> We could either put 'Create/Clone/Open New Repository' into
> the Repository menu and only present the recent repository
> list. Or we could offer push buttons for the other actions.
I agree entirely. That "Next" button is stupid stupid stupid.
What was I smoking that day? :-)
I'm concerned about putting them into the Repository menu only
as then the main window is competely void and users are sort of
wondering what they should do next. I think we should actually
do both. Put them into the menu and as push buttons on the window.
> + label $w_body.space
> + label $w_body.recentlabel \
> + -anchor w \
> + -text "Select Recent Repository:"
This string needs to be i18n'd with [mc ...].
> + listbox $w_body.recentlist \
Please make a field in this class called say "w_recentlist"
so you can use that field name instead of $w_body.recentlist.
This simplifies the code if we ever have to change the actual path
that the widget resides at, such as to alter the layout.
> +proc _append_recentrepos {path} {
> + set recent [get_config gui.recentrepos]
> + if {[lsearch $recent $path] < 0} {
> + lappend recent $path
> + }
> + if {[llength $recent] > 10} {
> + set recent [lrange $recent 1 end]
> + }
> + regsub -all "\[{}\]" $recent {"} recent
> + git config --global gui.recentrepos $recent
> +}
Why treat this as a Tcl list in a single value? Why not make it
a true multi-value configuration entry in ~/.gitconfig, like how
remote.$name.fetch is a multi-value entry? Does Windows allow
you to put " in a path name? Because the above regex will make
a list of paths that contains " in one of the entries invalid.
I think you also want to have this function return back immediately
if [lsearch $recent $path] >= 0 as then you don't invoke git-config
to perform a no-op change in the configuration file. As you well
know forking on Windows is a major cost. We shouldn't run git-config
just because the user opened a recent repository.
--
Shawn.
^ permalink raw reply
* Re: [PATCH 1/4] git-gui i18n: Add more words to glossary.
From: Johannes Schindelin @ 2007-10-07 23:31 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Christian Stimming, git
In-Reply-To: <20071007231231.GD2137@spearce.org>
Hi,
On Sun, 7 Oct 2007, Shawn O. Pearce wrote:
> If you are sending a series like that and its all po translation stuff
> that is unlikely to need commenting on feel free to just dump it all out
> as a single mbox (`git format-patch --stdout`) and attach it to the
> email. Less chance of the MUA mangling the message.
In this case, I suggest just pushing it to git-gui-i18n.git, maybe as a
temporary branch "for-shawn", and send a pull request. That's the best
way to ensure that nothing gets mangled.
Ciao,
Dscho
P.S.: Yeah, I haven't been really good with i18n recently; will try to put
more work into it soon.
^ permalink raw reply
* Re: Trying to use git-filter-branch to compress history by removing large, obsolete binary files
From: Elijah Newren @ 2007-10-07 23:38 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Frank Lichtenheld, git
In-Reply-To: <Pine.LNX.4.64.0710080028301.4174@racer.site>
Hi,
On 10/7/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Sun, 7 Oct 2007, Elijah Newren wrote:
<snip>
> > $ git clone test test2
> > <snip>
> > $ du -hs test
> > 11M test
> > $ du -hs test2
> > 11M test2
> >
> > Any other ideas?
>
> Yep. Maybe it is necessary to run "git gc" in test2.
Sweet, finally solved! That brings test2 down to 340K.
However, the solution seems somewhat involved...it requires running
git-filter-branch, git reset, removing the .git/refs/original/
directory, editing .git/packed-refs in some editor, running git reflog
expire, cloning the resulting repository, and running git gc yet
again. It seems like there has to be an easier way. (Anyone have
one?)
Oh, and git-filter-branch could really use some explanatory note about
how to actually complete rewriting the history.
Thanks,
Elijah
^ permalink raw reply
* StGit kha experimental branch updated
From: Karl Hasselström @ 2007-10-07 23:39 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
In-Reply-To: <20071007232943.GA1262@diana.vm.bytemark.co.uk>
There's nothing new here; it's all just rebased on top of the updated
safe branch. In order, we have
* David's patches that remove the "top" and "bottom" patch fields.
These need a format version upgrade function (trivial), but are
otherwise ready, I think.
* David's conflict refactoring series, with some fixes by me, and
removal of some commands that become superfluous. Almost ready,
but it makes ugly conflict markers, and "stg resolved" should
probably be removed.
The following changes since commit 2299c463794f214b750ecc33e24779243ddc5aff:
Karl Hasselström (1):
Make "stg refresh" subdirectory safe
are available in the git repository at:
git://repo.or.cz/stgit/kha.git experimental
David Kågedal (9):
Check bottom and invariants
Remove the 'bottom' field
Remove the 'top' field
Split git.merge into two functions
Leave working dir and index alone after failed (conflicting) push
Added a test case to check what happens when push finds a conflict
Simplify merge_recursive
Use the output from merge-recursive to list conflicts
Ask git about unmerged files
Karl Hasselström (9):
Better error message if merge fails
Fix "stg resolved" to work with new conflict representation
Refactoring: pass more than one file to resolved()
We keep the different stages of a conflict in the index now
Clean up the logic in "stg resolved"
"stg status --reset" is not needed anymore
Remove "stg add"
Remove "stg rm"
Remove "stg cp"
Documentation/stg-cp.txt | 63 --------------------------
Documentation/tutorial.txt | 22 +++++----
stgit/commands/add.py | 44 ------------------
stgit/commands/common.py | 25 +++-------
stgit/commands/copy.py | 45 ------------------
stgit/commands/pick.py | 2 +-
stgit/commands/resolved.py | 70 ++++++++++-------------------
stgit/commands/rm.py | 48 --------------------
stgit/commands/status.py | 34 +++++---------
stgit/commands/sync.py | 1 -
stgit/git.py | 72 +++++++++++++++++------------
stgit/gitmergeonefile.py | 99 ++++++++++++++++++++++------------------
stgit/main.py | 6 ---
stgit/run.py | 3 +
stgit/stack.py | 65 +++++++++++----------------
t/t0002-status.sh | 11 +++--
t/t1200-push-modified.sh | 2 +-
t/t1202-push-undo.sh | 4 +-
t/t1203-push-conflict.sh | 70 +++++++++++++++++++++++++++++
t/t1204-pop-keep.sh | 2 +-
t/t1205-push-subdir.sh | 4 +-
t/t1300-uncommit.sh | 4 +-
t/t1301-assimilate.sh | 2 +-
t/t1400-patch-history.sh | 4 +-
t/t1500-float.sh | 14 +++---
t/t1600-delete-one.sh | 12 +++---
t/t1601-delete-many.sh | 2 +-
t/t1700-goto-top.sh | 2 +-
t/t2000-sync.sh | 8 ++--
t/t2100-pull-policy-fetch.sh | 4 +-
t/t2101-pull-policy-pull.sh | 4 +-
t/t2102-pull-policy-rebase.sh | 4 +-
t/t2300-refresh-subdir.sh | 2 +-
33 files changed, 295 insertions(+), 459 deletions(-)
delete mode 100644 Documentation/stg-cp.txt
delete mode 100644 stgit/commands/add.py
delete mode 100644 stgit/commands/copy.py
delete mode 100644 stgit/commands/rm.py
create mode 100755 t/t1203-push-conflict.sh
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply
* Re: [PATCH 1/4] git-gui i18n: Add more words to glossary.
From: Shawn O. Pearce @ 2007-10-07 23:39 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Christian Stimming, git
In-Reply-To: <Pine.LNX.4.64.0710080029430.4174@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Sun, 7 Oct 2007, Shawn O. Pearce wrote:
>
> > If you are sending a series like that and its all po translation stuff
> > that is unlikely to need commenting on feel free to just dump it all out
> > as a single mbox (`git format-patch --stdout`) and attach it to the
> > email. Less chance of the MUA mangling the message.
>
> In this case, I suggest just pushing it to git-gui-i18n.git, maybe as a
> temporary branch "for-shawn", and send a pull request. That's the best
> way to ensure that nothing gets mangled.
Yea, that's an even better option. :-)
--
Shawn.
^ permalink raw reply
* Re: [StGit PATCH 4/8] Don't split long and short description in "stg edit"
From: David Brown @ 2007-10-07 23:40 UTC (permalink / raw)
To: Karl Hasselström; +Cc: Catalin Marinas, git
In-Reply-To: <20071007231735.12626.81744.stgit@yoghurt>
On Mon, Oct 08, 2007 at 01:17:35AM +0200, Karl Hasselström wrote:
>"stg edit" used to present the patch information like this:
>
> Short description
>
> From: ...
> Date: ...
>
> Long description
>
>If the project follows the git convention with a single-line short
>description and follwed by a blank line and the rest of the
>description, this merely looks a little odd. However, for projects
>that don't follow that convention, presenting the first line
>separately is actively inconvenient; for example, it breaks emacs's
>fill-paragraph command.
I think this fix is better to begin with. I found it especially confusing
when there was only a single line commit message. Now the header looks
like a header :-)
David
^ permalink raw reply
* Re: Trying to use git-filter-branch to compress history by removing large, obsolete binary files
From: Alex Riesen @ 2007-10-07 23:40 UTC (permalink / raw)
To: Elijah Newren; +Cc: Frank Lichtenheld, git
In-Reply-To: <51419b2c0710071524q16e9c593s2722dffc826e560d@mail.gmail.com>
Elijah Newren, Mon, Oct 08, 2007 00:24:49 +0200:
> On 10/7/07, Alex Riesen <raa.lkml@gmail.com> wrote:
> > rm -rf .git/refs/original/refs/heads/<the branch where HEAD pointed to>
> > (assuming you haven't repacked yet)
> >
> > or just edit .git/packed-refs and remove everything "refs/original"
> > which fits the criteria
> >
> > > So...how do I fix the reflog, and then repack to have a
> > > pack under 11MB in size?
> >
> > git reflog expire --all (it is a bit to much. You can just edit
> > .git/logs/* in any text editor)
>
> So...
>
> $ du -hs .
> 11M .
> $ rm -rf .git/refs/original/
> $ vi .git/packed-refs
> # Remove the line referring to refs/original...
> $ git reflog expire --all
> $ git gc --aggressive --prune
> $ du -hs .
> 11M .
>
> It's still 11MB.
>
> Any other ideas?
you missed something. Your example compresses to about 124k.
^ permalink raw reply
* Re: Trying to use git-filter-branch to compress history by removing large, obsolete binary files
From: Dmitry Potapov @ 2007-10-07 23:43 UTC (permalink / raw)
To: Elijah Newren; +Cc: Alex Riesen, Frank Lichtenheld, git
In-Reply-To: <51419b2c0710071524q16e9c593s2722dffc826e560d@mail.gmail.com>
On Sun, Oct 07, 2007 at 04:24:49PM -0600, Elijah Newren wrote:
> $ git reflog expire --all
> $ git gc --aggressive --prune
I believe this should work:
git reflog expire --all --expire-unreachable=0
git gc --prune
Warning: all unreachable references will be removed!
Dmitry
^ permalink raw reply
* Re: Trying to use git-filter-branch to compress history by removing large, obsolete binary files
From: Elijah Newren @ 2007-10-08 0:09 UTC (permalink / raw)
To: Alex Riesen; +Cc: Frank Lichtenheld, git
In-Reply-To: <20071007234039.GH2765@steel.home>
On 10/7/07, Alex Riesen <raa.lkml@gmail.com> wrote:
> you missed something. Your example compresses to about 124k.
What version of git are you running? I reran all the steps to which
you responded (repeated below for clarity) with git-1.5.3.3 and still
get 11MB. Also, you must have different filesystem extents than me
since an empty git repo takes 196k here[1], so I don't think any repo
is going to get down to 124k.
My understanding of the steps you suggest would work:
# Make a small repo
mkdir test
cd test
git init
echo hi > there
git add there
git commit -m 'Small repo'
# Add a random 10M binary file
dd if=/dev/urandom of=testme.txt count=10 bs=1M
git add testme.txt
git commit -m 'Add big binary file'
# Remove the 10M binary file
git rm testme.txt
git commit -m 'Remove big binary file'
# Compress the repo, see how big the repo is
git gc --aggressive --prune
du -ks . # 10548K
du -ks .git # 10532K
# Try to rewrite history to remove the binary file
git-filter-branch --tree-filter 'rm -f testme.txt' HEAD
git reset --hard
# Try to recompress and clean up, then check the new size
git gc --aggressive --prune
du -ks . # 10580K !?!?!?
du -ks .git # 10564K
# Do the stuff Alex suggests to trim the history
rm -rf .git/refs/original/
vi .git/packed-refs
# Use vi to remove the line referring to refs/original...
git reflog expire --all
git gc --aggressive --prune
du -ks . # Still 10564K
Thanks,
Elijah
[1] An empty git repo takes 196k for me, as can be seen by:
$mkdir tmp
$cd tmp
$git init
$du -hs .
196K .
^ permalink raw reply
* Re: Trying to use git-filter-branch to compress history by removing large, obsolete binary files
From: Elijah Newren @ 2007-10-08 0:22 UTC (permalink / raw)
To: Dmitry Potapov; +Cc: Alex Riesen, Frank Lichtenheld, git
In-Reply-To: <20071007234346.GA29433@potapov>
On 10/7/07, Dmitry Potapov <dpotapov@gmail.com> wrote:
> On Sun, Oct 07, 2007 at 04:24:49PM -0600, Elijah Newren wrote:
> > $ git reflog expire --all
> > $ git gc --aggressive --prune
>
> I believe this should work:
>
> git reflog expire --all --expire-unreachable=0
> git gc --prune
Yes, this seems to work. So the history-rewriting steps are
git-filter-branch --tree-filter 'rm -f testme.txt' HEAD
git reset --hard
rm -rf .git/refs/original/
vi .git/packed-refs
# Use vi to remove the line referring to refs/original...
git reflog expire --all --expire-unreachable=0
git gc --prune
Seems like a wrapper is needed. :-)
> Warning: all unreachable references will be removed!
What other scenarios could lead to unreachable references? I don't
know how to determine whether this is safe or not (except that these
were test repositories anyway, so I don't care what happens to them).
Thanks!
Elijah
^ permalink raw reply
* Re: Trying to use git-filter-branch to compress history by removing large, obsolete binary files
From: Johannes Schindelin @ 2007-10-08 0:34 UTC (permalink / raw)
To: Elijah Newren; +Cc: Frank Lichtenheld, git
In-Reply-To: <51419b2c0710071638p6dcc0c7cm2a813c22758e6f32@mail.gmail.com>
Hi,
On Sun, 7 Oct 2007, Elijah Newren wrote:
> On 10/7/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > On Sun, 7 Oct 2007, Elijah Newren wrote:
> <snip>
> > > $ git clone test test2
> > > <snip>
> > > $ du -hs test
> > > 11M test
> > > $ du -hs test2
> > > 11M test2
> > >
> > > Any other ideas?
> >
> > Yep. Maybe it is necessary to run "git gc" in test2.
>
> Sweet, finally solved! That brings test2 down to 340K.
>
> However, the solution seems somewhat involved...it requires running
> git-filter-branch, git reset, removing the .git/refs/original/
> directory, editing .git/packed-refs in some editor, running git reflog
> expire, cloning the resulting repository, and running git gc yet again.
> It seems like there has to be an easier way. (Anyone have one?)
It should be as easy as git filter-branch and git clone.
> Oh, and git-filter-branch could really use some explanatory note about
> how to actually complete rewriting the history.
It does what it should do. It is _your_ task to look at refs/original/*
if everything went alright. Then you just delete the checked refs.
What made your case so cumbersome was that you wanted the big objects out
_now_, instead of having them in for a grace period. BTW this grace
period is in place to help _you_, not the program. (In case you fscked up
and need those objects back.)
Ciao,
Dscho
^ permalink raw reply
* Re: Trying to use git-filter-branch to compress history by removing large, obsolete binary files
From: Elijah Newren @ 2007-10-08 0:47 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Frank Lichtenheld, git
In-Reply-To: <Pine.LNX.4.64.0710080129480.4174@racer.site>
On 10/7/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> It should be as easy as git filter-branch and git clone.
Yes, a git filter-branch, git clone, AND git gc in the clone avoids
all those funny ref editing commands. However, cloning a 5.6GB repo
(the size of one of the real repos I'm dealing with) will likely take
a long time (and may push me past the limits of disk space), so using
other steps to avoid the need to clone actually seems nicer.
> > Oh, and git-filter-branch could really use some explanatory note about
> > how to actually complete rewriting the history.
>
> It does what it should do. It is _your_ task to look at refs/original/*
> if everything went alright. Then you just delete the checked refs.
>
> What made your case so cumbersome was that you wanted the big objects out
> _now_, instead of having them in for a grace period. BTW this grace
> period is in place to help _you_, not the program. (In case you fscked up
> and need those objects back.)
Sure, I think that's a sane default. And I think it's fine that it
should be my task to look at the refs to check that everything worked
okay and delete them. But it's nearly impossible to figure out how to
do that! _That_ is my complaint. I got multiple misleading or
incomplete answers (both on this list and in #git) before getting some
working solutions, so this task is obviously far from trivial. I
really think that adding instructions about how to check and delete
the relevant refs would be a very useful addition to the
documentation.
Thanks everyone for the help!
Elijah
^ permalink raw reply
* Re: Trying to use git-filter-branch to compress history by removing large, obsolete binary files
From: J. Bruce Fields @ 2007-10-08 1:00 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Elijah Newren, Frank Lichtenheld, git
In-Reply-To: <Pine.LNX.4.64.0710080129480.4174@racer.site>
On Mon, Oct 08, 2007 at 01:34:07AM +0100, Johannes Schindelin wrote:
> It does what it should do. It is _your_ task to look at refs/original/*
> if everything went alright. Then you just delete the checked refs.
It seems odd to me, by the way, that filter-branch has its own
home-grown backup mechanism. Lots of other commands can "lose" commits,
but none of them keep an extra backup like this.
And I find it tedious for quicker jobs which it might otherwise be
useful for (e.g. rewrites of commits in my tree not yet in upstream),
unless I wrap it in a script that cleans up after itself.
--b.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox