widelands

Merge lp://staging/~widelands-dev/widelands/bug-1797702-spaces-in-names into lp://staging/widelands

  1. bug-1797702-spaces-in-names
  2. Merge into trunk
Proposed by Toni Förster
Status: Rejected
Rejected by: GunChleoc
Proposed branch: lp://staging/~widelands-dev/widelands/bug-1797702-spaces-in-names
Merge into: lp://staging/widelands
Prerequisite: lp://staging/~widelands-dev/widelands/bug-1827786-metaserver-login-box
Diff against target: 80 lines (+27/-4)
3 files modified
src/network/gamehost.cc (+3/-3)
src/ui_basic/editbox.h (+4/-0)
src/ui_fsmenu/netsetup_lan.cc (+20/-1)
To merge this branch: bzr merge lp://staging/~widelands-dev/widelands/bug-1797702-spaces-in-names
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+367123@code.staging.launchpad.net

This proposal supersedes a proposal from 2019-05-08.

Commit message

rework netsetup

- allowed characters are limited
- login with empty username not allowed
- if username ist taken append number
- don't join game with empty username

editbox

- added has_warning()

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4913. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/529880592.
Appveyor build 4694. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1797702_spaces_in_names-4694.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I think we should allow whitespace in player names. The fix needs to be done where we parse the chat commands.

review: Needs Fixing
Revision history for this message
Toni Förster (stonerl) wrote :

Neither on the forum nor the metaserver are spaces allowed. Since the nickname is shared across online gaming and LAN gaming, we need to apply the same naming rules.

Revision history for this message
GunChleoc (gunchleoc) wrote :

OK then.

@bunnybot merge

review: Approve
Revision history for this message
Toni Förster (stonerl) wrote :

This is no good.... we need to remove commit 9102 & 9100 from trunk. This wasn't supposed to go in because it depended on two other branches.

Revision history for this message
Toni Förster (stonerl) wrote :

I reverted it. Trunk should be clean now. This branch can go in as soon as the open-games and metaserver-login branches are merged.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4943. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/531220205.
Appveyor build 4724. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1797702_spaces_in_names-4724.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Error merging this proposal:

Output:
stdout:

stderr:
Committing to: /mnt/bunnybot_data/bunnybot_data/data/bzr_repo/_widelands_dev_widelands_trunk/
bzr: ERROR: No changes to commit. Please 'bzr add' the files you want to commit, or use --unchanged to force an empty commit.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Superseded by https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start/+merge/367314

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: