Differences between revisions 3 and 4
Revision 3 as of 2010-02-09 21:44:37
Size: 4136
Editor: frank
Comment:
Revision 4 as of 2010-02-09 21:50:54
Size: 5202
Editor: frank
Comment:
Deletions are marked like this. Additions are marked like this.
Line 20: Line 20:

{{{
hg clone [--startrev REV] [-r REV] [p4://server/clientname]
}}}
If the source repository name starts with p4:// then this
creates the destination repository and pulls all changes
from the p4 depot into it.
The --startrev and -r options set the first and last p4 changelist to pull. Setting a start revision
causes the contents of all files at that changelist to be included in the first converted revision.
There must be at least two revisions to clone if --startrev is set.

{{{
hg incoming [p4://server/clientname]
}}}
If the source repository name starts with p4:// then this
reports changes in the p4 depot that are not yet in the
local repository.

{{{
hg pull [-r REV] [p4://server/clientname]
}}}
If the source repository name starts with p4:// then this
imports changes from the p4 depot, automatically creating
merges of changelists submitted by hg push.
The -r option sets the last p4 changelist to pull.
If the perfarce.keep configuration is false then
the import does not leave files in the p4
workarea, otherwise the p4 workarea will be updated
with the new files.
Line 43: Line 72:
hg pull [-r REV] [p4://server/clientname] hg p4id [-r REV] [-nip]
Line 45: Line 74:
If the source repository name starts with p4:// then this
imports changes from the p4 depot, automatically creating
merges of changelists submitted by hg push.
The -r option sets the last p4 changelist to pull.
If the perfarce.keep configuration is false then
the import does not leave files in the p4
workarea, otherwise the p4 workarea will be updated
with the new files.
Shows the most recent P4 changelist known to Mercurial, or the P4 changelist associated with Mercurial revision REV.
The -n -i and -p options cause the local revision number, the global revision id and the p4 changelist number to be displayed.
Line 55: Line 78:
hg incoming [p4://server/clientname] hg p4pending [[--reset]]
Line 57: Line 80:
If the source repository name starts with p4:// then this
reports changes in the p4 depot that are not yet in the
local repository.
Shows pending changes, thos that have been pushed and possibly submitted, but not yet pulled from p4.
The --reset option causes Mercurial to clear its local state of pending changelists.
Line 62: Line 84:
hg clone [--startrev REV] [-r REV] [p4://server/clientname] hg p4submit [-a] [changelist]
Line 64: Line 86:
If the source repository name starts with p4:// then this
creates the destination repository and pulls all changes
from the p4 depot into it.
The --startrev and -r options set the first and last p4 changelist to pull.
Submit a changelist to p4.
If the -a option is given then all changes that have been pushed will be submitted.

{{{
hg p4revert [-a] [changelist]
}}}
Delete a changelist from p4, reverting any file changes.
If the -a option is given then all changes that have been pushed but not submitted will be reverted.

Perfarce Extension

This extension is not distributed with Mercurial.

Author: Frank Kingswood

Public repository: http://www.kingswood-consulting.co.uk/hg/perfarce

Overview

This extension modifies the remote repository handling so that repository paths that resemble

  • p4://p4server[:port]/clientname

cause operations on the named p4 client specification on the p4 server.

The client specification must already exist on the server before using this extension, and the working copy belonging to this client spec must be visible to hg.

Commands

hg clone [--startrev REV] [-r REV] [p4://server/clientname]

If the source repository name starts with p4:// then this creates the destination repository and pulls all changes from the p4 depot into it. The --startrev and -r options set the first and last p4 changelist to pull. Setting a start revision causes the contents of all files at that changelist to be included in the first converted revision. There must be at least two revisions to clone if --startrev is set.

hg incoming  [p4://server/clientname]

If the source repository name starts with p4:// then this reports changes in the p4 depot that are not yet in the local repository.

hg pull [-r REV] [p4://server/clientname]

If the source repository name starts with p4:// then this imports changes from the p4 depot, automatically creating merges of changelists submitted by hg push. The -r option sets the last p4 changelist to pull. If the perfarce.keep configuration is false then the import does not leave files in the p4 workarea, otherwise the p4 workarea will be updated with the new files.

hg outgoing [p4://server/clientname]

If the destination repository name starts with p4:// then this reports files affected by the revision(s) that are in the local repository but not in the p4 depot.

hg push [-r REV] [--submit] [p4://server/clientname]

If the destination repository name starts with p4:// then this exports changes from the local repository to the p4 depot. If no revision is specified then all changes since the last p4 changelist are pushed. In either case, all revisions to be pushed are folded into a single p4 changelist. Optionally the resulting changelist is submitted to the p4 server, controlled by the --submit option to push, or by the perfarce.submit configuration. If the perfarce.keep configuration is false then after a successful submit the files in the p4 workarea will be deleted.

hg p4id [-r REV] [-nip]

Shows the most recent P4 changelist known to Mercurial, or the P4 changelist associated with Mercurial revision REV. The -n -i and -p options cause the local revision number, the global revision id and the p4 changelist number to be displayed.

hg p4pending [[--reset]]

Shows pending changes, thos that have been pushed and possibly submitted, but not yet pulled from p4. The --reset option causes Mercurial to clear its local state of pending changelists.

hg p4submit [-a] [changelist]

Submit a changelist to p4. If the -a option is given then all changes that have been pushed will be submitted.

hg p4revert [-a] [changelist]

Delete a changelist from p4, reverting any file changes. If the -a option is given then all changes that have been pushed but not submitted will be reverted.

Configuration

Configure your .hgrc to enable the extension by adding following lines:

[extensions]
perfarce = /path/to/perfarce.py

[perfarce]
keep = True
submit = False
lowercasepaths = False
clientuser = search_regex replacement_string

If the keep option is true (this is default) then the Perfarce extension will keep the p4 workarea updated with the current top of tree in Perforce. If keep is false then the Perfarce extension does not leave files in the p4 workarea unless it is creating a changelist.

If the submit option is true then Perfarce will automatically submit a changelist when pushing changes to the p4 depot. The default is to create a pending changelist, and let the user review this before submitting, either with p4 submit or hg p4submit.

If the lowercasepaths option is true then the Perfarce extension forces all directory names received from p4 to lowercase, but leaving filenames unchanged. The default is to preserve filenames.

The clientuser option allows for 'cheap' multiuser operation with Perforce. The option argument is split on the first space into a search regular expression and a replacement string. If the regular expression matches the client spec name of an imported p4 changelist then the username for the changelist is changed to the value of the replacement string after it is capitalized. The replacement string can use regex matches to substitute part of the client spec name.An example could be

clientuser = ([a-z]+)\.([a-z-]+)--[a-zA-Z0-9-_.]+ \1 \2 <\1.\2@example.com>

which turns "firstname.lastname--my-client-name" into "Firstname Lastname <firstname.lastname@example.com>"


CategoryExtensionsByOthers

PerfarceExtension (last edited 2023-04-06 01:29:36 by Hudson Oliveira)