Mercurial > hg-talk
changeset 9:e3783841a9ff
Move configs and tasks to subdirs
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Fri, 07 Nov 2014 12:28:04 -0500 |
| parents | e7b19956f86d |
| children | 72b475850bb7 |
| files | hgrc-256color hgrc-basic hgrc-jordi sample-config/hgrc-256color sample-config/hgrc-basic sample-config/hgrc-jordi task-1 task-2 tasks/task-1 tasks/task-2 |
| diffstat | 10 files changed, 360 insertions(+), 360 deletions(-) [+] |
line wrap: on
line diff
--- a/hgrc-256color Fri Nov 07 12:19:06 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -[ui] -# Your name and email, e.g. -# username = Jane Doe <jdoe@example.com> -username = - -# Your editor of choice, e.g. Emacs, vim, Notepad++, TextMate... -# editor = emacs -editor = - -# Some useful aliases -[alias] -glog=log -G - - -[extensions] -# Basic useful extensions. These are all safe. -color= -progress= -pager = -record= - -# Careful! Some of these extensions are a bit dangerous if you don't -# understand what they are doing. -strip= -rebase= -shelve= -histedit= - -# The purge extension is *very* dangerous. It deletes all of your -# untracked files. Use with care! -purge= - - -# The pager needs some extra config to work right... -[pager] -pager = LESS='FSRX' less -attend = tags, help, annotate, cat, diff, export, status,\ - outgoing, incoming, glog, log, grep, sl, pvr, wip - -# This makes diffs show more information -[diff] -git = true -showfunc = 1 - -# This defines my custom xterm-256 colours. -[color] -mode=terminfo -color.orange = 202 -color.lightyellow = 191 -color.darkorange = 220 -color.brightyellow = 226 - -status.modified = magenta bold -status.added = green bold -status.removed = red bold -status.deleted = cyan bold -status.unknown = black bold -status.ignored = black bold -log.branch = cyan -log.summary = lightyellow -log.description = lightyellow -log.bookmark = green -log.tag = darkorange -log.graph = blue - -changeset.public = orange bold -changeset.secret = blue bold -changeset.draft = brightyellow bold - -diff.tab = bold magenta_background - -desc.here = bold blue_background - -# I push and pull a lot with local clones, so don't make my local -# clones publish those commits. -[phases] -publish = False
--- a/hgrc-basic Fri Nov 07 12:19:06 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -[ui] -# Your name and email, e.g. -# username = Jane Doe <jdoe@example.com> -username = - -# Your editor of choice, e.g. Emacs, vim, Notepad++, TextMate... -# editor = emacs -editor = - -# Some useful aliases -[alias] -glog=log -G - - -[extensions] -# Basic useful extensions. These are all safe. -color= -progress= -pager = -record= - -# The pager needs some extra config to work right... -[pager] -pager = LESS='FSRX' less -attend = tags, help, annotate, cat, diff, export, status,\ - outgoing, incoming, glog, log, grep, sl, pvr, wip - -# This makes diffs show more information -[diff] -git = true -showfunc = 1 - -# These are basic ANSI colours (i.e. not very colourful) -[color] -status.modified = magenta bold -status.added = green bold -status.removed = red bold -status.deleted = cyan bold -status.unknown = black bold -status.ignored = black bold -log.branch = cyan -log.summary = yellow -log.description = yellow -log.bookmark = green -log.tag = yellow -log.graph = blue - -changeset.public = red bold -changeset.draft = yellow -changeset.secret = blue - -qdesc.here = bold blue_background - -# I push and pull a lot with local clones, so don't make my local -# clones publish those commits. -[phases] -publish = False
--- a/hgrc-jordi Fri Nov 07 12:19:06 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,126 +0,0 @@ -[ui] -username = Jordi Gutiérrez Hermoso <jordigh@octave.org> -merge = emacs -editor = emacswait -debugger = ipdb -mergemarkers = detailed - -# My Emacs merge configuration -[merge-tools] -emacs.executable = emacspause -emacs.args = --eval "(ediff-merge-with-ancestor \""$local"\" \""$other"\" \""$base"\" nil \""$output"\")" - -# Some special alises -[alias] -garbage-collect=strip --hidden -r 'obsolete()' -stash=shelve -glog=log -G -email=email --confirm -pvr=log -pvr - -# These are all the extensions that I use. -[extensions] -convert= -strip= -record= -churn= -purge= -rebase= -highlight= -color= -progress= -patchbomb= -histedit= -largefiles= -shelve= - -pager = -hggit = ~/coding/vcs/hg-git/hggit -crecord= ~/coding/vcs/crecord/crecord -evolve=~/coding/vcs/evolve/hgext/evolve.py - -# The pager needs some extra config to work right... -[pager] -pager = LESS='FSRX' less -attend = tags, help, annotate, cat, diff, export, status,\ - outgoing, incoming, glog, log, grep, sl, pvr, wip - -# This defines my custom xterm-256 colours. -[color] -mode=terminfo -color.orange = 202 -color.lightyellow = 191 -color.darkorange = 220 -color.brightyellow = 226 - -status.modified = magenta bold -status.added = green bold -status.removed = red bold -status.deleted = cyan bold -status.unknown = black bold -status.ignored = black bold -log.branch = cyan -log.summary = lightyellow -log.description = lightyellow -log.bookmark = green -log.tag = darkorange -log.graph = blue - -changeset.public = orange bold -changeset.secret = blue bold -changeset.draft = brightyellow bold - -diff.tab = bold magenta_background - -desc.here = bold blue_background - -[tortoisehg] -authorcolor = True - -[subpaths] -git://git.sv.gnu.org/gnulib = /home/jordi/coding/vcs/gnulib - -# This makes diffs show more information -[diff] -git = true -showfunc = 1 - -[web] -pygments_style = emacs -style = paper -allow_archive = gz zip -archivesubrepos = true - -# This email stuff is for emailing patches to the Mercurial list for -# when I want to modify Mercurial itself. -[email] -method = smtp -from = Jordi Gutiérrez Hermoso <jordigh@octave.org> -to = mercurial-devel@selenic.com -cc = - -[smtp] -host = fencepost.gnu.org -tls = tls -username = jordigh -port = 587 - -# I push and pull a lot with local clones, so don't make my local -# clones publish those commits. -[phases] -publish = False - -[revsetalias] -bt($1) = ::$1 - ::@ - - -# This is complicated, but cool. For an explanation, see the following url: -# http://jordi.inversethought.com/blog/customising-mercurial-like-a-pro/ -[alias] -wip = log --graph --rev=wip --template=wip - -[templates] -wip = '{label("log.branch", branches)} {label("changeset.{phase}", rev)} {label("grep.user", author|user)}{label("log.tag", if(tags," {tags}"))} {label("log.bookmark", if(bookmarks," {bookmarks}"))}\n{label(ifcontains(rev, revset('.'), 'desc.here'),desc|firstline)}' - -[revsetalias] -wip = (parents(not public()) or not public() or . or head()) and (not obsolete() or unstable()^) and not closed()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample-config/hgrc-256color Fri Nov 07 12:28:04 2014 -0500 @@ -0,0 +1,77 @@ +[ui] +# Your name and email, e.g. +# username = Jane Doe <jdoe@example.com> +username = + +# Your editor of choice, e.g. Emacs, vim, Notepad++, TextMate... +# editor = emacs +editor = + +# Some useful aliases +[alias] +glog=log -G + + +[extensions] +# Basic useful extensions. These are all safe. +color= +progress= +pager = +record= + +# Careful! Some of these extensions are a bit dangerous if you don't +# understand what they are doing. +strip= +rebase= +shelve= +histedit= + +# The purge extension is *very* dangerous. It deletes all of your +# untracked files. Use with care! +purge= + + +# The pager needs some extra config to work right... +[pager] +pager = LESS='FSRX' less +attend = tags, help, annotate, cat, diff, export, status,\ + outgoing, incoming, glog, log, grep, sl, pvr, wip + +# This makes diffs show more information +[diff] +git = true +showfunc = 1 + +# This defines my custom xterm-256 colours. +[color] +mode=terminfo +color.orange = 202 +color.lightyellow = 191 +color.darkorange = 220 +color.brightyellow = 226 + +status.modified = magenta bold +status.added = green bold +status.removed = red bold +status.deleted = cyan bold +status.unknown = black bold +status.ignored = black bold +log.branch = cyan +log.summary = lightyellow +log.description = lightyellow +log.bookmark = green +log.tag = darkorange +log.graph = blue + +changeset.public = orange bold +changeset.secret = blue bold +changeset.draft = brightyellow bold + +diff.tab = bold magenta_background + +desc.here = bold blue_background + +# I push and pull a lot with local clones, so don't make my local +# clones publish those commits. +[phases] +publish = False
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample-config/hgrc-basic Fri Nov 07 12:28:04 2014 -0500 @@ -0,0 +1,57 @@ +[ui] +# Your name and email, e.g. +# username = Jane Doe <jdoe@example.com> +username = + +# Your editor of choice, e.g. Emacs, vim, Notepad++, TextMate... +# editor = emacs +editor = + +# Some useful aliases +[alias] +glog=log -G + + +[extensions] +# Basic useful extensions. These are all safe. +color= +progress= +pager = +record= + +# The pager needs some extra config to work right... +[pager] +pager = LESS='FSRX' less +attend = tags, help, annotate, cat, diff, export, status,\ + outgoing, incoming, glog, log, grep, sl, pvr, wip + +# This makes diffs show more information +[diff] +git = true +showfunc = 1 + +# These are basic ANSI colours (i.e. not very colourful) +[color] +status.modified = magenta bold +status.added = green bold +status.removed = red bold +status.deleted = cyan bold +status.unknown = black bold +status.ignored = black bold +log.branch = cyan +log.summary = yellow +log.description = yellow +log.bookmark = green +log.tag = yellow +log.graph = blue + +changeset.public = red bold +changeset.draft = yellow +changeset.secret = blue + +qdesc.here = bold blue_background + +# I push and pull a lot with local clones, so don't make my local +# clones publish those commits. +[phases] +publish = False
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sample-config/hgrc-jordi Fri Nov 07 12:28:04 2014 -0500 @@ -0,0 +1,126 @@ +[ui] +username = Jordi Gutiérrez Hermoso <jordigh@octave.org> +merge = emacs +editor = emacswait +debugger = ipdb +mergemarkers = detailed + +# My Emacs merge configuration +[merge-tools] +emacs.executable = emacspause +emacs.args = --eval "(ediff-merge-with-ancestor \""$local"\" \""$other"\" \""$base"\" nil \""$output"\")" + +# Some special alises +[alias] +garbage-collect=strip --hidden -r 'obsolete()' +stash=shelve +glog=log -G +email=email --confirm +pvr=log -pvr + +# These are all the extensions that I use. +[extensions] +convert= +strip= +record= +churn= +purge= +rebase= +highlight= +color= +progress= +patchbomb= +histedit= +largefiles= +shelve= + +pager = +hggit = ~/coding/vcs/hg-git/hggit +crecord= ~/coding/vcs/crecord/crecord +evolve=~/coding/vcs/evolve/hgext/evolve.py + +# The pager needs some extra config to work right... +[pager] +pager = LESS='FSRX' less +attend = tags, help, annotate, cat, diff, export, status,\ + outgoing, incoming, glog, log, grep, sl, pvr, wip + +# This defines my custom xterm-256 colours. +[color] +mode=terminfo +color.orange = 202 +color.lightyellow = 191 +color.darkorange = 220 +color.brightyellow = 226 + +status.modified = magenta bold +status.added = green bold +status.removed = red bold +status.deleted = cyan bold +status.unknown = black bold +status.ignored = black bold +log.branch = cyan +log.summary = lightyellow +log.description = lightyellow +log.bookmark = green +log.tag = darkorange +log.graph = blue + +changeset.public = orange bold +changeset.secret = blue bold +changeset.draft = brightyellow bold + +diff.tab = bold magenta_background + +desc.here = bold blue_background + +[tortoisehg] +authorcolor = True + +[subpaths] +git://git.sv.gnu.org/gnulib = /home/jordi/coding/vcs/gnulib + +# This makes diffs show more information +[diff] +git = true +showfunc = 1 + +[web] +pygments_style = emacs +style = paper +allow_archive = gz zip +archivesubrepos = true + +# This email stuff is for emailing patches to the Mercurial list for +# when I want to modify Mercurial itself. +[email] +method = smtp +from = Jordi Gutiérrez Hermoso <jordigh@octave.org> +to = mercurial-devel@selenic.com +cc = + +[smtp] +host = fencepost.gnu.org +tls = tls +username = jordigh +port = 587 + +# I push and pull a lot with local clones, so don't make my local +# clones publish those commits. +[phases] +publish = False + +[revsetalias] +bt($1) = ::$1 - ::@ + + +# This is complicated, but cool. For an explanation, see the following url: +# http://jordi.inversethought.com/blog/customising-mercurial-like-a-pro/ +[alias] +wip = log --graph --rev=wip --template=wip + +[templates] +wip = '{label("log.branch", branches)} {label("changeset.{phase}", rev)} {label("grep.user", author|user)}{label("log.tag", if(tags," {tags}"))} {label("log.bookmark", if(bookmarks," {bookmarks}"))}\n{label(ifcontains(rev, revset('.'), 'desc.here'),desc|firstline)}' + +[revsetalias] +wip = (parents(not public()) or not public() or . or head()) and (not obsolete() or unstable()^) and not closed()
--- a/task-1 Fri Nov 07 12:19:06 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -For this first task, write a short little program and track it with hg. - -* Write a program that prints out the numbers 1-10. - - Useful commands - =============== - - Get help - -------- - hg help - hg help <somecommand> - - Init a repo - ----------- - hg init - - Add, track files - ---------------- - hg add - hg addremove - - Record changes to your repo - --------------------------- - hg commit - -* Now make some change to your program. Make it print the numbers from - 1 to 100. Record this change. - - Useful commands - =============== - - Get information about your working directory - -------------------------------------------- - hg summary - hg status - hg diff - - Throw out changes in one file back to the repo status - ----------------------------------------------------- - hg revert - - Visit a different revision (these two are synonyms) - ------------------------------------------------------ - hg update - hg checkout - - Inspect a summary of your changes - --------------------------------- - hg log - hg log -G -
--- a/task-2 Fri Nov 07 12:19:06 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -For this second task, sign up on bitbucket and create a repository. - -* Upload your changes to this repository - - Useful commands - =============== - - Adding more remote paths to your repo - ------------------------------------- - hg config --local - - Compare your repo with the remote - --------------------------------- - hg incoming - hg outgoing - - Send and receive changes from the remote - ---------------------------------------- - hg pull - hg push - -If you pull new changes, you may often also want to update. You can do -both at once with - - hg pull --update - hg pull -u - -* Work with someone else, and both of you push to this repo. One of - you will be unable to push. In order to be able to push, you need to - merge or rebase. Remember that a rebase is a merge in which you - delete one commit. - - Useful commands - =============== - - Merge the files with another revision - ------------------------------------- - hg merge - - Change what a commit is based on - --------------------------------- - hg rebase - - Mark files as being resolved or unresolved in a merge - ----------------------------------------------------- - hg resolve --mark - hg resolve --unmark - -* After you resolve any conflicts, commit your merge and push it.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tasks/task-1 Fri Nov 07 12:28:04 2014 -0500 @@ -0,0 +1,51 @@ +For this first task, write a short little program and track it with hg. + +* Write a program that prints out the numbers 1-10. + + Useful commands + =============== + + Get help + -------- + hg help + hg help <somecommand> + + Init a repo + ----------- + hg init + + Add, track files + ---------------- + hg add + hg addremove + + Record changes to your repo + --------------------------- + hg commit + +* Now make some change to your program. Make it print the numbers from + 1 to 100. Record this change. + + Useful commands + =============== + + Get information about your working directory + -------------------------------------------- + hg summary + hg status + hg diff + + Throw out changes in one file back to the repo status + ----------------------------------------------------- + hg revert + + Visit a different revision (these two are synonyms) + ------------------------------------------------------ + hg update + hg checkout + + Inspect a summary of your changes + --------------------------------- + hg log + hg log -G +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tasks/task-2 Fri Nov 07 12:28:04 2014 -0500 @@ -0,0 +1,49 @@ +For this second task, sign up on bitbucket and create a repository. + +* Upload your changes to this repository + + Useful commands + =============== + + Adding more remote paths to your repo + ------------------------------------- + hg config --local + + Compare your repo with the remote + --------------------------------- + hg incoming + hg outgoing + + Send and receive changes from the remote + ---------------------------------------- + hg pull + hg push + +If you pull new changes, you may often also want to update. You can do +both at once with + + hg pull --update + hg pull -u + +* Work with someone else, and both of you push to this repo. One of + you will be unable to push. In order to be able to push, you need to + merge or rebase. Remember that a rebase is a merge in which you + delete one commit. + + Useful commands + =============== + + Merge the files with another revision + ------------------------------------- + hg merge + + Change what a commit is based on + --------------------------------- + hg rebase + + Mark files as being resolved or unresolved in a merge + ----------------------------------------------------- + hg resolve --mark + hg resolve --unmark + +* After you resolve any conflicts, commit your merge and push it.