Committed revision 275 to http://bzr.xsteve.at/dvc/

Merged from Michael Olson: Renamed dvc-apply -> dvc-call, implemented 
dvc-remove-optional-args, some xgit improvements
    ------------------------------------------------------------
    revno: 241.1.53
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Tue 2007-10-30 10:19:56 -0400
    message:
      dvc-log-edit-done: Snarf the current prefix argument
      
      This allows C-u C-c C-c in a log edit buffer to actually work for xgit.
    ------------------------------------------------------------
    revno: 241.1.52
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Tue 2007-10-30 00:17:34 -0400
    message:
      xgit: Support placing the .git directory outside of the work tree
      
      * lisp/xgit-core.el (xgit-git-dir-mapping): New option that is a mapping
        from the root of a directory tree to the desired git metadata
        directory.  This allows you to store .git outside of the work tree.
        (xgit-lookup-external-git-dir): New function that looks up either the
        root dir or metadata dir from xgit-git-dir-mapping.
        (xgit-tree-root): Use xgit-lookup-external-git-dir.
        (xgit-git-dir): Ditto.  Avoid adding ".git" to the end if we got it
        from there.
        (xgit-prepare-environment): If xgit-lookup-external-git-dir yields
        something, set GIT_DIR to it.
    ------------------------------------------------------------
    revno: 241.1.51
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Mon 2007-10-29 20:30:25 -0400
    message:
      Fix goof in dvc-remove-optional-args
      
      * lisp/dvc-unified.el (dvc-remove-optional-args): Fix bug where dvc-delta
        wasn't working.  The logic should be sound now.
    ------------------------------------------------------------
    revno: 241.1.50
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Mon 2007-10-29 10:18:55 -0400
    message:
      Add &optional keyword to some backend-specific DVC unified functions
      
      Now that we have proper handling of the &optional keyword at the right
      place, we can afford to do this.
    ------------------------------------------------------------
    revno: 241.1.49
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Mon 2007-10-29 10:08:53 -0400
    message:
      Handle &optional arguments correctly in define-dvc-unified-command
      
      * lisp/dvc-unified.el (dvc-remove-optional-args): New function that
        handles args according to spec.  If optional args are nil -- that is,
        &optional appears in spec at just the right place -- then remove them.
        This allows us to actually have &optional arguments handled correctly
        in define-dvc-unified-command.
        (define-dvc-unified-command): Use it.  Add docstring.
    ------------------------------------------------------------
    revno: 241.1.48
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Mon 2007-10-29 10:05:42 -0400
    message:
      Make dvc-call and dvc-apply
      
      dvc-apply was acting like a `funcall' function, which was confusing.  I
      instead made it act like `apply', and made a `dvc-call' function which
      would act like a `funcall'.  I was originally going to name this
      `dvc-funcall', but we already have `dvc-funcall-if-exists', which is
      slightly different.
    ------------------------------------------------------------
    revno: 241.1.47
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Mon 2007-10-29 07:13:02 -0400
    message:
      xgit: Amending last patch, deal with case where xgit-use-index is 'ask
    ------------------------------------------------------------
    revno: 241.1.46
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Wed 2007-10-24 11:03:49 -0400
    message:
      xgit: Allow C-u C-c C-c in dvc-log to invert behavior of xgit-use-index
      
      * lisp/dvc-unified.el (dvc-log-edit-done): Take additional optional
        argument, in case the backend wants some flexibility in how to do their
        commit.
      
      * lisp/xgit-dvc.el (xgit-dvc-log-edit-done): Use the additional argument
        invert-normal, which inverts the normal behavior regarding use of the
        index just for this commit.  If files were marked in the partner
        buffer, then override xgit-use-index -- the user obviously wants to use
        the index in this scenario.
    ------------------------------------------------------------
    revno: 241.1.45
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Thu 2007-10-18 19:39:20 -0400
    message:
      Merge from Stefan
    ------------------------------------------------------------
    revno: 241.1.44
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Thu 2007-10-18 19:38:59 -0400
    message:
      Merge from Matthieu
    ------------------------------------------------------------
    revno: 241.1.43
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Sun 2007-10-14 17:25:52 -0400
    message:
      Merge from Stefan
    ------------------------------------------------------------
    revno: 241.1.42
    merged: [EMAIL PROTECTED]
    committer: Michael W. Olson <[EMAIL PROTECTED]>
    branch nick: mwolson
    timestamp: Thu 2007-10-11 09:24:48 -0400
    message:
      CONTRIBUTORS: Update, alphabetize

_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev

Reply via email to