]> git.madduck.net Git - code/vcsh.git/log

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

code/vcsh.git
8 years agoMerge pull request #183 from ohspite/ff-initial-merge
Richard Hartmann [Sun, 29 Nov 2015 19:14:48 +0000 (20:14 +0100)]
Merge pull request #183 from ohspite/ff-initial-merge

vcsh: Always fast forward initial merge

8 years agoMerge pull request #179 from dottedmag/master
Richard Hartmann [Sun, 29 Nov 2015 16:59:08 +0000 (17:59 +0100)]
Merge pull request #179 from dottedmag/master

Fix broken list-tracked-by -- list_tracked expects repository at $2

8 years agoMerge branch 'feature/fix-d946b07817ffe6e156c159e7fc6270322413e530'
Richard Hartmann [Sun, 29 Nov 2015 12:53:56 +0000 (13:53 +0100)]
Merge branch 'feature/fix-d946b07817ffe6e156c159e7fc6270322413e530'

8 years agoSpeed up `which` by avoiding a loop
Felix Eckhofer [Mon, 15 Jun 2015 23:46:28 +0000 (01:46 +0200)]
Speed up `which` by avoiding a loop

8 years agovcsh: Fix regression introduced in d946b07817ffe6e
Richard Hartmann [Sun, 29 Nov 2015 12:33:45 +0000 (13:33 +0100)]
vcsh: Fix regression introduced in d946b07817ffe6e

github: Closes richih/vcsh#168

8 years agovcsh: Always fast forward initial merge
Don [Mon, 21 Sep 2015 21:49:26 +0000 (17:49 -0400)]
vcsh: Always fast forward initial merge

Ignore `merge.ff = no` if set in .gitconfig.

8 years agoFix broken list-tracked-by -- list_tracked expects repository at $2
Mikhail Gusarov [Thu, 20 Aug 2015 10:02:36 +0000 (12:02 +0200)]
Fix broken list-tracked-by -- list_tracked expects repository at $2

8 years agot/100-init.t: Fix failure due to locale
Florian Engel [Mon, 25 May 2015 18:38:39 +0000 (20:38 +0200)]
t/100-init.t: Fix failure due to locale

8 years agoMerge branch 'feature/status_--terse'
Richard Hartmann [Mon, 18 May 2015 07:21:25 +0000 (09:21 +0200)]
Merge branch 'feature/status_--terse'

8 years agovcsh: Prepare status() for vcsh longopts
Richard Hartmann [Mon, 18 May 2015 07:19:58 +0000 (09:19 +0200)]
vcsh: Prepare status() for vcsh longopts

8 years agot/300-add.t: Fix warning
Richard Hartmann [Mon, 18 May 2015 07:07:13 +0000 (09:07 +0200)]
t/300-add.t: Fix warning

t/300-add.t ........ "my" variable $output masks earlier declaration in
same scope at t/300-add.t line 32.

8 years agoUpdate copyright info
Richard Hartmann [Wed, 6 May 2015 13:34:49 +0000 (15:34 +0200)]
Update copyright info

9 years agovcsh: list_untracked(): remove --nocheck-order
Eli Young [Tue, 14 Apr 2015 23:46:43 +0000 (16:46 -0700)]
vcsh: list_untracked(): remove --nocheck-order

`--nocheck-order` is only supported by GNU `comm`, but it isn't
necessary anyway because we sort the inputs first.

9 years agodoc/INSTALL.md: Specify how to install as user
Richard Hartmann [Mon, 13 Apr 2015 05:11:53 +0000 (07:11 +0200)]
doc/INSTALL.md: Specify how to install as user

9 years agoAdd test for terse status output
Mikhail Gusarov [Mon, 2 Mar 2015 18:17:40 +0000 (19:17 +0100)]
Add test for terse status output

9 years agovcsh stat --terse
Mikhail Gusarov [Fri, 27 Feb 2015 08:58:43 +0000 (09:58 +0100)]
vcsh stat --terse

only shows repositories with changes, which makes it suitable to be run
during login shell startup.

9 years agoREADME.md: Use build tag for master
Richard Hartmann [Tue, 24 Feb 2015 19:08:28 +0000 (20:08 +0100)]
README.md: Use build tag for master

9 years ago.travis.yml: moo dependencies
Richard Hartmann [Mon, 23 Feb 2015 18:08:01 +0000 (19:08 +0100)]
.travis.yml: moo dependencies

9 years ago.travis.yml: moo
Richard Hartmann [Mon, 23 Feb 2015 16:48:38 +0000 (17:48 +0100)]
.travis.yml: moo

Needs more cowbell

9 years ago.travis.yml: Less spam
Richard Hartmann [Mon, 23 Feb 2015 16:40:58 +0000 (17:40 +0100)]
.travis.yml: Less spam

9 years agoMerge branch 'feature/travis-ci'
Richard Hartmann [Mon, 23 Feb 2015 16:32:13 +0000 (17:32 +0100)]
Merge branch 'feature/travis-ci'

9 years agoREADME.md: Formatting
Richard Hartmann [Mon, 23 Feb 2015 16:31:16 +0000 (17:31 +0100)]
README.md: Formatting

9 years agoREADME.md: Add Travis CI build state
Richard Hartmann [Mon, 23 Feb 2015 16:30:02 +0000 (17:30 +0100)]
README.md: Add Travis CI build state

9 years ago.travis.yml: Use built-in system for Perl deps
Richard Hartmann [Mon, 23 Feb 2015 16:08:16 +0000 (17:08 +0100)]
.travis.yml: Use built-in system for Perl deps

9 years ago.travis.yml: Add build dep on libshell-command-perl
Richard Hartmann [Mon, 23 Feb 2015 15:47:42 +0000 (16:47 +0100)]
.travis.yml: Add build dep on libshell-command-perl

9 years ago.travis.yml: Use sudo
Richard Hartmann [Mon, 23 Feb 2015 15:39:08 +0000 (16:39 +0100)]
.travis.yml: Use sudo

9 years ago.travis.yml: %s/^\t/ /
Richard Hartmann [Mon, 23 Feb 2015 15:33:48 +0000 (16:33 +0100)]
.travis.yml: %s/^\t/  /

9 years agoInitial support for Travis CI
Richard Hartmann [Mon, 23 Feb 2015 15:05:28 +0000 (16:05 +0100)]
Initial support for Travis CI

9 years agoMakefile: Formatting
Richard Hartmann [Mon, 23 Feb 2015 14:41:19 +0000 (15:41 +0100)]
Makefile: Formatting

9 years agoMerge branch 'master' of github.com:RichiH/vcsh
Richard Hartmann [Mon, 23 Feb 2015 14:28:56 +0000 (15:28 +0100)]
Merge branch 'master' of github.com:RichiH/vcsh

9 years agoCONTRIBUTORS: Update
Richard Hartmann [Mon, 23 Feb 2015 14:28:40 +0000 (15:28 +0100)]
CONTRIBUTORS: Update

9 years agoMakefile: Delete correct doc dir
Richard Hartmann [Wed, 11 Feb 2015 19:10:46 +0000 (20:10 +0100)]
Makefile: Delete correct doc dir

Seems not a lot of people `make purge`...

9 years agoMerge branch 'feature/tests'
Richard Hartmann [Wed, 11 Feb 2015 18:53:25 +0000 (19:53 +0100)]
Merge branch 'feature/tests'

9 years agoAdd pre-commit hook into tools/
Richard Hartmann [Wed, 11 Feb 2015 18:51:50 +0000 (19:51 +0100)]
Add pre-commit hook into tools/

9 years agoMakefile: Add `prove` to make test
Richard Hartmann [Wed, 11 Feb 2015 18:49:46 +0000 (19:49 +0100)]
Makefile: Add `prove` to make test

9 years agoFixed typo in vcsh.1.ronn
Mathias Svensson [Mon, 12 Jan 2015 08:13:32 +0000 (09:13 +0100)]
Fixed typo in vcsh.1.ronn

9 years agot/300-add.t: Get rid of useless diag()
Richard Hartmann [Sat, 1 Nov 2014 20:13:54 +0000 (21:13 +0100)]
t/300-add.t: Get rid of useless diag()

9 years agot/100-init.t: Update test to match new output
Richard Hartmann [Sat, 1 Nov 2014 06:19:59 +0000 (07:19 +0100)]
t/100-init.t: Update test to match new output

9 years agoMerge branch 'master' into feature/tests
Richard Hartmann [Sat, 1 Nov 2014 06:17:33 +0000 (07:17 +0100)]
Merge branch 'master' into feature/tests

9 years agoFix tests
Richard Hartmann [Sat, 25 Oct 2014 23:04:13 +0000 (01:04 +0200)]
Fix tests

9 years agoRelease 1.20141026
Richard Hartmann [Sat, 25 Oct 2014 22:24:07 +0000 (00:24 +0200)]
Release 1.20141026

9 years agovcsh: Improve clone() error handling
Richard Hartmann [Sat, 25 Oct 2014 21:23:05 +0000 (23:23 +0200)]
vcsh: Improve clone() error handling

9 years agovcsh: FIX fatal()
Richard Hartmann [Sat, 25 Oct 2014 21:22:54 +0000 (23:22 +0200)]
vcsh: FIX fatal()

9 years agoMerge branch 'feature--clone_branch'
Richard Hartmann [Sat, 25 Oct 2014 20:33:39 +0000 (22:33 +0200)]
Merge branch 'feature--clone_branch'

Conflicts:
vcsh

9 years agoRelease v1.20141025
Richard Hartmann [Sat, 25 Oct 2014 19:25:49 +0000 (21:25 +0200)]
Release v1.20141025

9 years agoUse cowsay from the PATH instead
Dridi Boukelmoune [Fri, 9 May 2014 08:14:49 +0000 (10:14 +0200)]
Use cowsay from the PATH instead

9 years agoMerge branch 'feature/repository_specific_configuration'
Richard Hartmann [Sat, 25 Oct 2014 05:58:06 +0000 (07:58 +0200)]
Merge branch 'feature/repository_specific_configuration'

9 years agoMerge branch 'feature/status_against_remote_tracking'
Richard Hartmann [Sat, 25 Oct 2014 05:57:56 +0000 (07:57 +0200)]
Merge branch 'feature/status_against_remote_tracking'

Conflicts:
vcsh

9 years agovcsh: support repo-specific config files
Richard Hartmann [Fri, 24 Oct 2014 20:19:08 +0000 (22:19 +0200)]
vcsh: support repo-specific config files

9 years agoMerge pull request #144 from mirabilos/patch-1
Richard Hartmann [Fri, 24 Oct 2014 19:44:34 +0000 (21:44 +0200)]
Merge pull request #144 from mirabilos/patch-1

permit "-b <branch>" to come later on the command line

9 years agopermit "-b <branch>" to come later on the command line
mirabilos [Fri, 24 Oct 2014 09:52:02 +0000 (11:52 +0200)]
permit "-b <branch>" to come later on the command line

9 years agodoc/vcsh.1.ronn: Document clone [-b `branch`]
Dridi Boukelmoune [Fri, 24 Oct 2014 09:22:41 +0000 (11:22 +0200)]
doc/vcsh.1.ronn: Document clone [-b `branch`]

9 years agovcsh: Fail fast if the clone branch is not valid
Dridi Boukelmoune [Fri, 24 Oct 2014 09:09:22 +0000 (11:09 +0200)]
vcsh: Fail fast if the clone branch is not valid

Also fixed the last hardcoded reference to the master branch.

9 years agovcsh: Replace `list-tracked-by` with `list-tracked <repo>`
Richard Hartmann [Thu, 23 Oct 2014 19:02:17 +0000 (21:02 +0200)]
vcsh: Replace `list-tracked-by` with `list-tracked <repo>`

Also, refactor list_tracked_by() to re-use code

9 years agovcsh: Move list_untracked() into correct place
Richard Hartmann [Thu, 23 Oct 2014 18:46:48 +0000 (20:46 +0200)]
vcsh: Move list_untracked() into correct place

9 years agovcsh: Factor out code from status() into status_helper()
Richard Hartmann [Thu, 23 Oct 2014 18:45:06 +0000 (20:45 +0200)]
vcsh: Factor out code from status() into status_helper()

9 years agoMerge branch 'feature/list-untracked'
Richard Hartmann [Thu, 23 Oct 2014 18:38:10 +0000 (20:38 +0200)]
Merge branch 'feature/list-untracked'

github: Closes richih/vcsh#142

9 years agovcsh: Allow `vcsh list-untracked <repo>`
Richard Hartmann [Thu, 23 Oct 2014 18:37:29 +0000 (20:37 +0200)]
vcsh: Allow `vcsh list-untracked <repo>`

9 years agoMerge branch 'feature--overlay_functions'
Richard Hartmann [Thu, 23 Oct 2014 18:17:04 +0000 (20:17 +0200)]
Merge branch 'feature--overlay_functions'

9 years agovcsh.1.ronn: Make the warning even more scary
Richard Hartmann [Thu, 23 Oct 2014 18:16:36 +0000 (20:16 +0200)]
vcsh.1.ronn: Make the warning even more scary

9 years agoMerge branch 'feature--improve_clone_errors'
Richard Hartmann [Thu, 23 Oct 2014 18:03:50 +0000 (20:03 +0200)]
Merge branch 'feature--improve_clone_errors'

9 years agoAdd documentation for `list-untracked`
Richard Hartmann [Wed, 22 Oct 2014 22:57:01 +0000 (00:57 +0200)]
Add documentation for `list-untracked`

9 years ago_vcsh: Add completion for `list-untracked` and `status`
Richard Hartmann [Wed, 22 Oct 2014 22:56:10 +0000 (00:56 +0200)]
_vcsh: Add completion for `list-untracked` and `status`

9 years agovcsh: list_untracked(): Avoid `cut`; speed up `-r`
Richard Hartmann [Wed, 22 Oct 2014 22:44:36 +0000 (00:44 +0200)]
vcsh: list_untracked(): Avoid `cut`; speed up `-r`

Avoid spawning `cut` and speed recursive mode up from "takes several seconds on a
current machine" to "instant".

Thanks to Thorsten Glaser.

9 years agovcsh: Add support for `vcsh list-untracked -r`
Richard Hartmann [Wed, 22 Oct 2014 22:40:54 +0000 (00:40 +0200)]
vcsh: Add support for `vcsh list-untracked -r`

9 years agovcsh: Remove extra function
Richard Hartmann [Wed, 22 Oct 2014 22:27:06 +0000 (00:27 +0200)]
vcsh: Remove extra function

9 years agovcsh: Use BSD/OS X compatible `mktemp`
Richard Hartmann [Wed, 22 Oct 2014 22:26:30 +0000 (00:26 +0200)]
vcsh: Use BSD/OS X compatible `mktemp`

9 years agovcsh: Fix random tab
Richard Hartmann [Wed, 22 Oct 2014 22:22:02 +0000 (00:22 +0200)]
vcsh: Fix random tab

9 years agovcsh: Make fatal() default to `exit 1`
Richard Hartmann [Wed, 22 Oct 2014 22:02:11 +0000 (00:02 +0200)]
vcsh: Make fatal() default to `exit 1`

9 years agovcsh: Make status() show commit offsets to remote tracking branch
Richard Hartmann [Wed, 22 Oct 2014 21:35:35 +0000 (23:35 +0200)]
vcsh: Make status() show commit offsets to remote tracking branch

github: Fixes richih/vcsh#123

9 years agoReplace temporary repository with copy based method
Mert Dirik [Wed, 22 Oct 2014 21:09:11 +0000 (00:09 +0300)]
Replace temporary repository with copy based method

9 years agovcsh: `vcsh clone [-b <branch>] <remote> [<repo>]`
Dridi Boukelmoune [Wed, 22 Oct 2014 16:47:36 +0000 (18:47 +0200)]
vcsh: `vcsh clone [-b <branch>] <remote> [<repo>]`

This is the API for an optional branch selection for `vcsh clone`. It is
basically inspired by `git clone [-b|--branch <name>] <remote>`. I could
have used the long option `--branch` too but vcsh only uses short ones.

9 years agovcsh: Only fetch the upstream branch during clone
Dridi Boukelmoune [Sat, 12 Oct 2013 18:11:32 +0000 (20:11 +0200)]
vcsh: Only fetch the upstream branch during clone

9 years agovcsh: Create the local branch during clone
Dridi Boukelmoune [Sat, 12 Oct 2013 17:49:07 +0000 (19:49 +0200)]
vcsh: Create the local branch during clone

This will create and checkout a local branch named after the upstream
branch. It will also gracefully behave for the default `master' branch
and consistently show the same message:

Switched to a new branch '$VCSH_BRANCH'

9 years agovcsh: Proper quoting for "$VCSH_BRANCH"
Richard Hartmann [Thu, 12 Sep 2013 21:30:27 +0000 (23:30 +0200)]
vcsh: Proper quoting for "$VCSH_BRANCH"

9 years agovcsh: Initial support for cloning from branches other than master
Richard Hartmann [Sat, 7 Sep 2013 11:34:23 +0000 (13:34 +0200)]
vcsh: Initial support for cloning from branches other than master

9 years agovcsh: Improve error handling of clone()
Richard Hartmann [Tue, 21 Oct 2014 21:25:42 +0000 (23:25 +0200)]
vcsh: Improve error handling of clone()

May fix https://github.com/RichiH/vcsh/issues/122

9 years agoAdd recursive option (-r)
Mert Dirik [Tue, 21 Oct 2014 13:30:43 +0000 (16:30 +0300)]
Add recursive option (-r)

9 years agoDon't use subshell when creating the temporary repo
Mert Dirik [Tue, 21 Oct 2014 12:34:29 +0000 (15:34 +0300)]
Don't use subshell when creating the temporary repo

9 years agoCheck for existence of 'comm' command
Mert Dirik [Tue, 21 Oct 2014 00:09:14 +0000 (03:09 +0300)]
Check for existence of 'comm' command

9 years agoAdd checks to file operations
Mert Dirik [Tue, 21 Oct 2014 00:08:25 +0000 (03:08 +0300)]
Add checks to file operations

9 years agoForce temporary file/directory removal
Mert Dirik [Mon, 20 Oct 2014 21:25:43 +0000 (00:25 +0300)]
Force temporary file/directory removal

9 years agovcsh: Add support for overlay functions
Richard Hartmann [Mon, 20 Oct 2014 20:37:06 +0000 (22:37 +0200)]
vcsh: Add support for overlay functions

9 years agovcsh: Make `vcsh which dontexist` exit 1
Richard Hartmann [Sun, 19 Oct 2014 06:34:09 +0000 (08:34 +0200)]
vcsh: Make `vcsh which dontexist` exit 1

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760882

9 years ago3rd try
Mert Dirik [Sun, 19 Oct 2014 00:24:04 +0000 (03:24 +0300)]
3rd try

9 years agotest commit; rewrite to use comm and two temp files to get around argument too long...
Richard Hartmann [Fri, 13 Jan 2012 01:07:02 +0000 (02:07 +0100)]
test commit; rewrite to use comm and two temp files to get around argument too long crap

9 years agotest commit
Richard Hartmann [Thu, 12 Jan 2012 23:43:12 +0000 (00:43 +0100)]
test commit

9 years agotest commit
Richard Hartmann [Thu, 12 Jan 2012 23:39:33 +0000 (00:39 +0100)]
test commit

9 years agoRelease v1.20141009
Richard Hartmann [Thu, 9 Oct 2014 21:22:03 +0000 (23:22 +0200)]
Release v1.20141009

9 years agoMerge pull request #139 from yuvallanger/patch-2
Richard Hartmann [Mon, 8 Sep 2014 20:39:14 +0000 (22:39 +0200)]
Merge pull request #139 from yuvallanger/patch-2

README: Using a `repo_name` instead of `foo`

9 years agoRename `foo` to a meaningful name `repo_name`
Yuval Langer [Sun, 7 Sep 2014 14:39:22 +0000 (17:39 +0300)]
Rename `foo` to a meaningful name `repo_name`

I get lost within all of those meaningless names.
It is useful to give things meaningful names, especially in documentation.

9 years agoMerge pull request #138 from yuvallanger/patch-1
Richard Hartmann [Sun, 7 Sep 2014 11:14:07 +0000 (13:14 +0200)]
Merge pull request #138 from yuvallanger/patch-1

typo `that you cat track` -> `that you can track`

9 years agotypo `that you cat track` -> `that you can track`
Yuval Langer [Sun, 7 Sep 2014 08:19:27 +0000 (11:19 +0300)]
typo `that you cat track` -> `that you can track`

9 years agoMakefile: Allow `PREFIX=foo make install`
Richard Hartmann [Mon, 25 Aug 2014 15:45:12 +0000 (17:45 +0200)]
Makefile: Allow `PREFIX=foo make install`

9 years agoMerge pull request #134 from mirabilos/master
Richard Hartmann [Sat, 7 Jun 2014 08:22:22 +0000 (10:22 +0200)]
Merge pull request #134 from mirabilos/master

fix issue 125 and some printf vulnerabilities

9 years agoMerge pull request #135 from ajschumacher/patch-1
Richard Hartmann [Fri, 23 May 2014 17:55:51 +0000 (19:55 +0200)]
Merge pull request #135 from ajschumacher/patch-1

typo: "availabile.d" to "available.d"

9 years agotypo: "availabile.d" to "available.d"
Aaron Schumacher [Wed, 21 May 2014 20:01:04 +0000 (16:01 -0400)]
typo: "availabile.d" to "available.d"

9 years agoUse cowsay from the PATH instead
Dridi Boukelmoune [Fri, 9 May 2014 08:14:49 +0000 (10:14 +0200)]
Use cowsay from the PATH instead

9 years agoDisplay full paths in list-tracked*
Thorsten Glaser [Wed, 7 May 2014 08:20:32 +0000 (10:20 +0200)]
Display full paths in list-tracked*

Closes https://github.com/RichiH/vcsh/issues/125

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
9 years agoMerge branch 'master' of github.com:RichiH/vcsh
Richard Hartmann [Thu, 8 May 2014 17:58:56 +0000 (19:58 +0200)]
Merge branch 'master' of github.com:RichiH/vcsh