Branch: Tag:

2017-11-20

2017-11-20 14:51:58 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge commit '8468d07e63a61e80c5a7916ab61c0f25135ac2fc' into patches/ftp

Synch with Roxen 6.0/6.1 split.

* commit '8468d07e63a61e80c5a7916ab61c0f25135ac2fc': (428 commits)

2017-11-17

2017-11-17 10:17:43 by Karl Gustav Sterneberg <kg@roxen.com>

Merge branch 'devel' into kg/archive-client

2017-09-17

2017-09-17 10:17:43 by Pontus Östlund <ponost@roxen.com>

Merge branch 'devel' into ponost/admin-if-17

2017-09-12

2017-09-12 09:20:32 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.1

* grubba/patchsystem:
git-rxnpatch: Fixed .distignore handling.

2017-09-12 09:19:54 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Fixed .distignore handling.

2017-09-12 09:15:29 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed .distignore handling.

Empty .distignore files are noops; NOT directives to ignore the
entire directory.

Fixes issues with patches missing some files.

2017-08-28

2017-08-28 11:08:27 by Karl Gustav Sterneberg <kg@roxen.com>

Merge branch 'devel' into feature/CMS-247-prevent-full-local-path-as-filename

2017-08-25

2017-08-25 10:46:08 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.1

* grubba/patchsystem:
git-rxnpatch: Fixed some option name typos.
git-rxnpatch: Add support for filename remapping.
git-rxnpatch: Added option --path-remap-rule.

2017-08-25 10:38:53 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Fixed some option name typos.
git-rxnpatch: Add support for filename remapping.
git-rxnpatch: Added option --path-remap-rule.

2017-08-25 10:37:27 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed some option name typos.

The --path-remap-rule option should now work.

Fixes [WS-58] some more.

2017-08-25 10:29:25 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Add support for filename remapping.

The "make" command now rewrites relevant parts of the generated diffs
to support remapping of filenames.

Fixes remainder of [WS-58].

2017-08-25 09:54:32 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Added option --path-remap-rule.

This option is used to edit the path_remapping_rules.txt file.

It will in turn be used to perform custom remapping of files to
handle files that have been moved by the build system.

Fixes some of [WS-58].

2017-05-05

2017-05-05 12:11:38 by Karl Gustav Sterneberg <kg@roxen.com>

Merge branch 'devel' into kg/archive-client

2017-04-24

2017-04-24 14:00:19 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.0

* grubba/patchsystem:
git-rxnpatch: Workaround for git-diff quoting bug.

2017-04-24 13:59:51 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.1

* grubba/patchsystem:
git-rxnpatch: Workaround for git-diff quoting bug.

2017-04-24 13:59:11 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Workaround for git-diff quoting bug.

2017-04-24 13:56:29 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Workaround for git-diff quoting bug.

git-diff doesn't quote filenames containing spaces.

Adds some heuristics to work around the problem.

Fixes some of [IS-35].

2017-04-19

2017-04-19 09:09:37 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.0

* grubba/patchsystem:
git-rxnpatch: More fixes to the ident verifier.

2017-04-19 09:08:59 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.1

* grubba/patchsystem:
git-rxnpatch: More fixes to the ident verifier.

2017-04-19 09:07:23 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: More fixes to the ident verifier.

2017-04-19 09:03:42 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: More fixes to the ident verifier.

* Don't complain about ourselves...

* Fixes building of patch 2017-03-30T172238.

2017-03-30

2017-03-30 09:37:00 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.0

* grubba/patchsystem:
RoxenPatch: The installation log file is now in UTF-8.
git-rxnpatch: More fixes for release sync clusters.
git-rxnpatch: Generate release sync clusters for all releases.
git-rxnpatch: Added cluster --force.
git-rxnpatch: Improved diagnostics.
git-rxnpatch: Minor code clean up.
git-rxnpatch: Don't attempt to cat the empty blob.
RoxenPatch: New files may now force overwrites.
git-rxnpatch: Log failed git command
Read author info from environment
git-rxnpatch: Identify patch clusters by the most recent patch.
git-rxnpatch: Fixed name of release clusters.
git-rxnpatch: Create separate clusters for different releases.
git-rxnpatch: Moved parsing of metadata.txt to a separate function.
git-rxnpatch [cluster]: Some code cleanup.
git-rxnpatch: Fixed multiple issues with the ident verifier.
git-rxnpatch: Fixed multiple patch message.
git-rxnpatch: Validate $Id$ expansions.
git-rxnpatch: Added option --subject for subcommand "new".

2017-01-20

2017-01-20 13:14:57 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.1

* grubba/patchsystem:
git-rxnpatch: More fixes for release sync clusters.

2017-01-20 13:14:12 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: More fixes for release sync clusters.

2017-01-20 13:11:16 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: More fixes for release sync clusters.

Fixes issue where derived patches could generate sync clusters
between the same version (causing an infinite loop later when
generating meta clusters).

2017-01-18

2017-01-18 11:26:43 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.1

* grubba/patchsystem:
git-rxnpatch: Generate release sync clusters for all releases.

2017-01-18 10:24:23 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Generate release sync clusters for all releases.

2017-01-18 10:18:25 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Generate release sync clusters for all releases.

Previously a release sync cluster was only generated for the latest
release if there were patches for it.

Fixes issue where the meta cluster for Roxen 5.4.94-r3 contained
sync patches intended for Roxen 5.4.88-r2. This was due to the
sync clusters 5.4.88-5.4.94 not having been generated, and the
sync patches having ended up in the generic cluster.

Fixes [IS-26].

2017-01-17

2017-01-17 11:38:47 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.1

* grubba/patchsystem:
git-rxnpatch: Added cluster --force.
git-rxnpatch: Improved diagnostics.
git-rxnpatch: Minor code clean up.
git-rxnpatch: Don't attempt to cat the empty blob.

2017-01-17 11:37:23 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Added cluster --force.
git-rxnpatch: Improved diagnostics.
git-rxnpatch: Minor code clean up.
git-rxnpatch: Don't attempt to cat the empty blob.

2017-01-17 11:34:46 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Added cluster --force.

Make it possible to generate a new cluster even if the current one
seems up to date. This is needed for some old branches to generate
the the release-specific clusters if they are missing.

2017-01-04

2017-01-04 11:47:00 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Improved diagnostics.

2017-01-04 11:46:40 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Minor code clean up.

2017-01-04 11:45:21 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Don't attempt to cat the empty blob.

2016-12-05

2016-12-05 16:15:55 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.1

* grubba/patchsystem:
RoxenPatch: New files may now force overwrites.
git-rxnpatch: Log failed git command
Read author info from environment
git-rxnpatch: Identify patch clusters by the most recent patch.
git-rxnpatch: Fixed name of release clusters.
git-rxnpatch: Create separate clusters for different releases.
git-rxnpatch: Moved parsing of metadata.txt to a separate function.
git-rxnpatch [cluster]: Some code cleanup.

2016-12-05 15:59:27 by Anders Johansson <anders@roxen.com>

git-rxnpatch: Log failed git command

2016-12-05 15:58:37 by Anders Johansson <anders@roxen.com>

Read author info from environment

2016-12-01

2016-12-01 09:55:38 by Anders Johansson <anders@roxen.com>

git-rxnpatch: Log failed git command

2016-11-30

2016-11-30 15:28:58 by Anders Johansson <anders@roxen.com>

Read author info from environment

2016-11-28

2016-11-28 11:22:16 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Identify patch clusters by the most recent patch.
git-rxnpatch: Fixed name of release clusters.

2016-11-28 11:21:09 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Identify patch clusters by the most recent patch.

2016-11-25

2016-11-25 17:40:43 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed name of release clusters.

2016-11-24

2016-11-24 14:32:05 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Create separate clusters for different releases.
git-rxnpatch: Moved parsing of metadata.txt to a separate function.
git-rxnpatch [cluster]: Some code cleanup.

2016-11-24 14:31:43 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Create separate clusters for different releases.

Preparation for [IS 6].

2016-11-24 14:01:24 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Moved parsing of metadata.txt to a separate function.

2016-11-23

2016-11-23 17:22:15 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch [cluster]: Some code cleanup.

Prepare for making several clusters.

Preparations for [IS 6].

2016-11-17

2016-11-17 10:32:54 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.1

* grubba/patchsystem:
git-rxnpatch: Fixed multiple issues with the ident verifier.

2016-11-17 10:32:08 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Fixed multiple issues with the ident verifier.

2016-11-17 10:30:00 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed multiple issues with the ident verifier.

* Fixed typo in git command.

* Remap the dist paths to repository paths.

2016-11-08

2016-11-08 16:19:15 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.1

* grubba/patchsystem:
git-rxnpatch: Fixed multiple patch message.
git-rxnpatch: Validate $Id$ expansions.

2016-11-08 16:18:33 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Fixed multiple patch message.
git-rxnpatch: Validate $Id$ expansions.

2016-11-08 16:17:49 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed multiple patch message.

2016-11-08 16:06:43 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Validate $Id$ expansions.

Potential fix for [bug 7822].

2016-08-23

2016-08-23 14:12:41 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Added option --subject for subcommand "new".

2016-08-23 14:09:23 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Added option --subject for subcommand "new".

--subject now sets the subject for the new patch, while
--message sets the description (previously the subject).

This should be less confusing.

2016-02-23

2016-02-23 13:23:02 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 6.0

* grubba/patchsystem:
RoxenPatch: Support external generation of patch id.
RoxenPatch: Errors should be reported on stderr.

2016-02-23 13:22:03 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
RoxenPatch: Support external generation of patch id.
RoxenPatch: Errors should be reported on stderr.

2016-02-23 13:20:48 by Henrik Grubbström (Grubba) <grubba@grubba.org>

RoxenPatch: Support external generation of patch id.

Also fixes broken paranoia check in new_patchid().

2016-02-23 13:07:26 by Henrik Grubbström (Grubba) <grubba@grubba.org>

RoxenPatch: Errors should be reported on stderr.

2014-08-08

2014-08-08 12:39:09 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'patches/pike8.0' into patches/bug4594

* patches/pike8.0: (230 commits)
Pike 8.0: More SSL/TLS API changes.
FTPS: Fixed support for Pike 8.0.
Roxen: Use the current names for the ASN1 classes.
SNMP: The LDAP private ASN.1 classes aren't available in Pike 8.0.
SNMP: The fields tag and cls are variables in Pike 8.0.
Pike 8.0: More SSL changes.
Pike 8.0: Improved robustness when upgrading old certs.
Pike 8.0: Upgrade old automatic X.509v1 certs to X.509v3.
Pike 8.0: Fixed SSL port binding with new API.
Pike 8.0: Take advantage of the improved SSL support.
Pike 8.0: Add support for some new SSL features.
Pike 8.0: #if efun() is obsolete since 10 years back.
Pike 8.0: String.Buffer contains a sprintf().
Pike 8.0: Unset variables are UNDEFINED.
Roxen 5.4.1.
ABS: List the pending call_outs.
Fix warnings generated by Pike 8.0.
DB browser: add support for custom DB field formatters in owning modules.
DBManager.module_table_info: Consider all module entries from the DB.
Added transliteration module.
...

Conflicts:
server/base_server/roxen.pike

2014-08-06

2014-08-06 10:11:47 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.4

* grubba/patchsystem:
Rxnpatch: Added some cluster creation paranoia.
Rxnpatch: Support creation of multiple clusters on the same day.
Rxnpatch: Support multiple revisions of clusters.

2014-08-06 10:10:51 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
Rxnpatch: Added some cluster creation paranoia.
Rxnpatch: Support creation of multiple clusters on the same day.
Rxnpatch: Support multiple revisions of clusters.

2014-08-06 10:06:56 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Rxnpatch: Added some cluster creation paranoia.

Cluster creation now aborts (instead of making an invalid tar file)
if a contained filename is too long (ie 100 characters or more).
This is unlikely to ever happen, but...

2014-08-06 10:04:11 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Rxnpatch: Support creation of multiple clusters on the same day.

If a cluster already exists, a revision number will be appended
to the timestamp (starting with "-02") to make it unique.

Fixes [bug 7225].

2014-08-06 10:02:09 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Rxnpatch: Support multiple revisions of clusters.

Prepares for fixing [bug 7225].

2014-05-16

2014-05-16 09:57:21 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge commit '64ea9f116367427932716bbbb417bd3f20b99feb' into patches/pike8.0

* commit '64ea9f116367427932716bbbb417bd3f20b99feb': (904 commits)
Roxen 5.4.1.
...

Updates the base version for the Pike 8.0 patches to Roxen 5.4.1.

2013-09-27

2013-09-27 13:49:46 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Adjusted path used to determine mode bits.

2013-09-27 13:49:36 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Adjusted path used to determine mode bits.

2013-09-27 13:48:04 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Adjusted path used to determine mode bits.

Fixes [bug 6898].

2013-09-27 13:21:41 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Fixed typo.

2013-09-27 13:21:22 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Fixed typo.

2013-09-27 13:20:55 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed typo.

2013-09-27 13:19:45 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Retain file mode for all blobs.
RoxenPatch: Added virtual dependency roxenpatch/file-modes.
RoxenPatch: Preserve exec bit when extracting tar files.
git-rxnpatch: Retain exec bit in generated patch.

2013-09-27 13:19:23 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Retain file mode for all blobs.

2013-09-27 13:17:22 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Retain file mode for all blobs.

The file mode was lost for binary files being replaced.

Fixes remaining issue of [bug 6898] part 1.

2013-09-27 12:35:37 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
RoxenPatch: Added virtual dependency roxenpatch/file-modes.
RoxenPatch: Preserve exec bit when extracting tar files.
git-rxnpatch: Retain exec bit in generated patch.

2013-09-27 12:26:07 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Retain exec bit in generated patch.

The file protection mode bits were lost for new or binary files.
They are now preserved in the generated rxp archive.

Fixes [bug 6898] part 1.

2013-09-23

2013-09-23 08:52:18 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Fixed API-miss in git_push().

2013-09-23 08:51:55 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Fixed API-miss in git_push().

2013-09-23 08:49:50 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed API-miss in git_push().

Fixes bug in previous commit.

2013-09-17

2013-09-17 13:20:03 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Moved git-push to dedicated function.
git-rxnpatch: Fixed indent-expansion for new files.

2013-09-17 13:19:13 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Moved git-push to dedicated function.
git-rxnpatch: Fixed indent-expansion for new files.

2013-09-17 13:18:42 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Moved git-push to dedicated function.

This makes it easier to test.

2013-09-17 13:12:43 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed indent-expansion for new files.

$Id$-strings were not expanded in new files, but were in succeeding
patches (and dists). This caused succeding patches to fail.

Fixes [bug 6889].

2013-08-15

2013-08-15 11:59:56 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: First go at supporting delete.

2013-08-15 11:59:27 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: First go at supporting delete.

2013-08-15 11:56:44 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: First go at supporting delete.

Adds support for deleting the latest patch on the current branch.

2013-08-08

2013-08-08 13:15:09 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Fix multiple roxenpatch/pike-support dependencies.

2013-08-08 13:15:06 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Fix multiple roxenpatch/pike-support dependencies.

2013-08-08 13:12:11 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fix multiple roxenpatch/pike-support dependencies.

Fixes a bug causing one roxenpatch/pike-support dependency being added
for every file patched. The bug was due to the intended variable being
shadowed by another of the same name.

2013-08-08 11:57:23 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
RoxenPatch: Support roxenpatch feature dependencies.

2013-08-08 11:57:20 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
RoxenPatch: Support roxenpatch feature dependencies.

2013-08-08 11:53:32 by Henrik Grubbström (Grubba) <grubba@grubba.org>

RoxenPatch: Support roxenpatch feature dependencies.

* Adds support for the virtual dependency "roxenpatch/pike-support",
to ensure that RoxenPatch in use has the proper patch level before
a pike/lib/* patch is applied.

* git-rxnpatch now automatically adds the above dependency when needed.

2013-08-06

2013-08-06 16:56:08 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
RoxenPatch: Improved support for patching Pike.
git-rxnpatch: Filter testsuite files.

2013-08-06 16:50:01 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
RoxenPatch: Improved support for patching Pike.
git-rxnpatch: Filter testsuite files.

2013-08-06 16:32:36 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Filter testsuite files.

2013-08-06 09:24:52 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Support release tags for Pike.
git-rxnpatch: Fixed init --relative.

2013-08-06 09:24:41 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Support release tags for Pike.
git-rxnpatch: Fixed init --relative.

2013-08-06 09:16:24 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Support release tags for Pike.

2013-08-06 09:07:29 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed init --relative.

The --relative option got lost on first initialization.

2013-08-05

2013-08-05 12:18:14 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Filter git and distmaker control files.

2013-08-05 12:17:57 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Filter git and distmaker control files.

2013-08-05 12:17:16 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Filter git and distmaker control files.

2013-08-05 11:32:30 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
RoxenPatch: Fixed generation of mtime on old Pike.
git-rxnpatch: Fixed cluster command whith existing clusters.
git-rxnpatch: Ensure full blob sha1s. Fixes [bug 6853].
RoxenPatch: Reduce use of external binaries.

2013-08-05 11:32:06 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
RoxenPatch: Fixed generation of mtime on old Pike.

2013-08-05 11:30:13 by Henrik Grubbström (Grubba) <grubba@grubba.org>

RoxenPatch: Fixed generation of mtime on old Pike.

Calendar.dwim_time() apparently doesn't support ISO timestamps
in Pike 7.8 and earlier.

2013-08-05 10:20:50 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Fixed cluster command whith existing clusters.
git-rxnpatch: Ensure full blob sha1s. Fixes [bug 6853].
RoxenPatch: Reduce use of external binaries.

2013-08-05 10:16:17 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed cluster command whith existing clusters.

A trailing newline in the cluster base sha1 caused the
git-diff-tree(1) command to fail.

Fixes [bug 6854].

2013-08-05 10:02:41 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Ensure full blob sha1s. Fixes [bug 6853].

git-diff(1) defaults to using short blob identifiers, which
breaks the new file detection in the git-rxnpatch make command.

2013-07-11

2013-07-11 09:17:17 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Improved tar compatibility for clusters.

2013-07-11 09:16:28 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Improved tar compatibility for clusters.

2013-07-11 09:13:33 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Improved tar compatibility for clusters.

The tar header used by clusters now follows the compat
recomendations from FreeBSD's tar(5).

Fixes [bug 6828] some more.

2013-07-10

2013-07-10 14:04:51 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Added support for creating patch clusters.
Changed hashbang path.
git-rxnpatch: Fix issue in description formatter.

2013-07-10 14:03:59 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Added support for creating patch clusters.
Changed hashbang path.
git-rxnpatch: Fix issue in description formatter.

2013-07-10 14:00:21 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Added support for creating patch clusters.

Fixes [bug 6828].

2013-05-28

2013-05-28 10:19:10 by Anders Johansson <anders@roxen.com>

Changed hashbang path.

2013-05-27

2013-05-27 12:01:26 by Anders Johansson <anders@roxen.com>

Changed hashbang path.

2013-05-23

2013-05-23 14:12:17 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fix issue in description formatter.

The special case with a single commit wasn't working
correctly in format_description().

2013-05-20

2013-05-20 16:42:31 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Implemented list command.
git-rxnpatch: Improved status information.
git-rxnpatch: Fixed detection of diverged branches.
git-rxnpatch: Reverse order of commits in description.
git-rxnpatch: Improved handling of flags.

2013-05-20 16:41:58 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Implemented list command.
git-rxnpatch: Improved status information.
git-rxnpatch: Fixed detection of diverged branches.
git-rxnpatch: Reverse order of commits in description.
git-rxnpatch: Improved handling of flags.

2013-05-20 16:39:09 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Implemented list command.

It is now possible to list the commits that not yet have a patch
with the list command.

2013-05-20 14:52:52 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Improved status information.

The status command now lists patches that are pending.

2013-05-20 14:42:50 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed detection of diverged branches.

2013-05-20 13:59:03 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Reverse order of commits in description.

Bullets are now only generated for individual commits.

2013-05-20 13:24:58 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Improved handling of flags.

--restart is now default.

The flags set by --flag are now actually propagated to rxnpatch.

In addition the case-sensitivity of the metadata.txt parser
has been relaxed somewhat.

2013-05-17

2013-05-17 10:06:19 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Fixed stray linefeed in default description.
RoxenPatch: More javascript fixes.

2013-05-17 10:05:58 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Fixed stray linefeed in default description.
RoxenPatch: More javascript fixes.

2013-05-17 10:02:54 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed stray linefeed in default description.

When the generated patch corresponded to a single commit,
the patch description got an extra linefeed prepended.

This empty line was also promoted to the default patch subject line.

2013-05-16

2013-05-16 13:48:44 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Improve usability somewhat.
RoxenPatch: Fixed support for alternative deps in javascript.

2013-05-16 13:48:19 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Improve usability somewhat.
RoxenPatch: Fixed support for alternative deps in javascript.

2013-05-16 13:47:06 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Improve usability somewhat.

* Warn when init is run without --path-prefix.

* Normalize the path prefix in the same manner as the subtree prefix.

2013-05-07

2013-05-07 15:42:25 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Fixed some bugs in git_update().

2013-05-07 15:42:18 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Fixed some bugs in git_update().

2013-05-07 15:39:27 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed some bugs in git_update().

git_update() had problems when the updated branch didn't
exist locally, but did exist at the remote "origin".

2013-05-07 13:30:22 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem:
git-rxnpatch: Fix .distignore filtering when --relative.
git-rxnpatch: Fixed bug in diff parser.

2013-05-07 13:28:46 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem:
git-rxnpatch: Fix .distignore filtering when --relative.
git-rxnpatch: Fixed bug in diff parser.

2013-05-07 13:28:36 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fix .distignore filtering when --relative.

2013-05-07 13:27:32 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed bug in diff parser.

Fixes issue where paths were missing from affected-files.txt
and .distignore missed filtering some files.

2013-05-07 12:26:00 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into 5.2

* grubba/patchsystem: (26 commits)
git-rxnpatch: Fixed documentation miss.
git-rxnpatch: Added stubs for the unimplemented commands.
git-rxnpatch: Support generating patches for a subtree.
git-rxnpatch: Push altered state to origin.
git-rxnpatch: Added informational file affected-files.txt.
git-rxnpatch: There's no need to commit when there's no change.
git-rxnpatch: Separated patch subject from description.
git-rxnpatch: Improved formatting of help text.
git-rxnpatch: Fixed typo in handling of dependencies.
git-rxnpatch: Improved generation of patch description some more.
git-rxnpatch: Improved default patch description.
git-rxnpatch: Fixed some options to rxnpatch.
git-rxnpatch: Implement $Id$-expansion.
git-rxnpatch: Fixed typo in generated patchid.
git-rxnpatch: Disable use of fast-import feature "done".
git-rxnpatch: Support Pikes without the Git module.
git-rxnpatch: Track upstream.
git-rxnpatch: Implemented some more options.
git-rxnpatch: Improved validation of HEAD.
git-rxnpatch: The rxnpatch/rxnpatch branch is now a normal branch
...

2013-05-07 12:25:27 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Merge branch 'grubba/patchsystem' into devel

* grubba/patchsystem: (26 commits)
git-rxnpatch: Fixed documentation miss.
git-rxnpatch: Added stubs for the unimplemented commands.
git-rxnpatch: Support generating patches for a subtree.
git-rxnpatch: Push altered state to origin.
git-rxnpatch: Added informational file affected-files.txt.
git-rxnpatch: There's no need to commit when there's no change.
git-rxnpatch: Separated patch subject from description.
git-rxnpatch: Improved formatting of help text.
git-rxnpatch: Fixed typo in handling of dependencies.
git-rxnpatch: Improved generation of patch description some more.
git-rxnpatch: Improved default patch description.
git-rxnpatch: Fixed some options to rxnpatch.
git-rxnpatch: Implement $Id$-expansion.
git-rxnpatch: Fixed typo in generated patchid.
git-rxnpatch: Disable use of fast-import feature "done".
git-rxnpatch: Support Pikes without the Git module.
git-rxnpatch: Track upstream.
git-rxnpatch: Implemented some more options.
git-rxnpatch: Improved validation of HEAD.
git-rxnpatch: The rxnpatch/rxnpatch branch is now a normal branch
...

2013-05-07 12:21:31 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed documentation miss.

2013-05-07 12:21:19 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Added stubs for the unimplemented commands.

2013-05-07 12:11:14 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Support generating patches for a subtree.

This feature is typically used when the repository contains
directory levels that are not part of the dist. A typical
example is the Roxen repository itself, which contains
the actual "server" directory level, while patches are to
be relative to it.

2013-05-07 10:01:30 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Push altered state to origin.

Attempt to keep the remote repository "origin" up to date.

2013-05-07 10:00:12 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Added informational file affected-files.txt.

2013-05-07 09:56:58 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: There's no need to commit when there's no change.

2013-05-07 09:29:50 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Separated patch subject from description.

2013-05-07 09:07:56 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Improved formatting of help text.

2013-05-07 09:07:28 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed typo in handling of dependencies.

2013-05-06

2013-05-06 15:53:01 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Improved generation of patch description some more.

Make sure that bug reference markers aren't split, and normalize them.

Unicode clean.

2013-05-06 15:34:54 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Improved default patch description.

Implemented some formatting that does a decent job
of generating a patch description.

2013-05-06 13:53:22 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed some options to rxnpatch.

2013-05-06 13:37:00 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Implement $Id$-expansion.

Add sufficient configuration magic to get git-diff(1) to expand
$Id$-strings.

Fixes [bug 6763] comment #3.

2013-05-06 13:33:32 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Fixed typo in generated patchid.

2013-05-06 13:32:51 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Disable use of fast-import feature "done".

This is needed to support older versions of git-fast-import.

2013-05-06 12:38:08 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Support Pikes without the Git module.

Copied sufficient code from the Pike 7.9 Git module to support Pike 7.8.

2013-05-06 12:19:15 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Track upstream.

Attempt to keep up to date with upstream (ie remote "origin").

2013-05-06 12:17:21 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Implemented some more options.

The command line options --depends, --flag and --originator
should now work.

2013-05-06 11:31:37 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Improved validation of HEAD.

Make sure that HEAD looks like a development branch, and
not one of git-rxnpatch's internal branches.

2013-05-06 10:27:03 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: The rxnpatch/rxnpatch branch is now a normal branch

Also unified the initialization code and fixed some bugs pertaining
to git-ls-tree.

2013-05-06 09:12:07 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Implemented --path-prefix option.

2013-05-06 09:12:06 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Support .distignore filtering.

Fixes some more of [bug 6763].

2013-05-06 09:12:04 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Support binary files.

The raw patch data is now parsed to detect binary files,
as well as new and deleted files.

Note that this requires a rxnpatch.pike that uses
the new RoxenPatch.parse_src_dest_path().

2013-05-06 09:11:35 by Henrik Grubbström (Grubba) <grubba@grubba.org>

git-rxnpatch: Added tool for generating RXPs from git.

Fixes much of [bug 6763].